diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-21 14:07:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-21 14:07:44 -0700 |
| commit | 29fdd5ba6297f865046e3793481be4979f75d85a (patch) | |
| tree | 2c94f76f4b6f6ab683257e8e7c9480a85d6c3942 /MAINTAINERS | |
| parent | d1433d55c75652e7af76b32188a1b5f8af654ab3 (diff) | |
| parent | 4560d67722816cca4b2f3dfb1d7c5b902fd2075b (diff) | |
| download | linux-29fdd5ba6297f865046e3793481be4979f75d85a.tar.gz | |
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 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 05dc39d66920..cb78ab59610d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4446,6 +4446,13 @@ F: include/linux/i2c-*.h F: include/uapi/linux/i2c.h F: include/uapi/linux/i2c-*.h +I2C ACPI SUPPORT +M: Mika Westerberg <mika.westerberg@linux.intel.com> +L: linux-i2c@vger.kernel.org +L: linux-acpi@vger.kernel.org +S: Maintained +F: drivers/i2c/i2c-acpi.c + I2C-TAOS-EVM DRIVER M: Jean Delvare <jdelvare@suse.de> L: linux-i2c@vger.kernel.org |