diff options
author | Linus Torvalds | 2014-08-21 23:07:44 +0200 |
---|---|---|
committer | Linus Torvalds | 2014-08-21 23:07:44 +0200 |
commit | 29fdd5ba6297f865046e3793481be4979f75d85a (patch) | |
tree | 2c94f76f4b6f6ab683257e8e7c9480a85d6c3942 /sound/soc/soc-dapm.c | |
parent | Merge tag 'please-pull-memfd_create' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
parent | MAINTAINERS: add maintainer for ACPI parts of I2C (diff) | |
download | kernel-qcow2-linux-29fdd5ba6297f865046e3793481be4979f75d85a.tar.gz kernel-qcow2-linux-29fdd5ba6297f865046e3793481be4979f75d85a.tar.xz kernel-qcow2-linux-29fdd5ba6297f865046e3793481be4979f75d85a.zip |
Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c fixes from Wolfram Sang:
"Here is the fixup for the 'lowlight' of my last pull request. I2C is
not selected anymore by I2C_ACPI. Instead, the code in question now
depends on I2C=y.
Also, Mika has agreed to support me and be the maintainer for I2C-ACPI
related patches. Finally, a new-ID-patch came along last week"
* 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
MAINTAINERS: add maintainer for ACPI parts of I2C
i2c: i801: Add PCI ID for Intel Braswell
i2c: rework kernel config I2C_ACPI
Diffstat (limited to 'sound/soc/soc-dapm.c')
0 files changed, 0 insertions, 0 deletions