aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds2013-02-26 11:41:53 -0600
committerLinus Torvalds2013-02-26 11:41:53 -0600
commit52caa59ed335616c5254adff7911465a57ed9f14 (patch)
treede0a1e91850c9e439e82f83f228d89fee3b90b09 /MAINTAINERS
parent4c8c225abf972ce422c241579ce1d4d27eaeb166 (diff)
parent55827f4aa6442ddd1d6a4e1e32f2f457eb113c22 (diff)
downloadam43-linux-kernel-52caa59ed335616c5254adff7911465a57ed9f14.tar.gz
am43-linux-kernel-52caa59ed335616c5254adff7911465a57ed9f14.tar.xz
am43-linux-kernel-52caa59ed335616c5254adff7911465a57ed9f14.zip
Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c updates from Wolfram Sang: "Highlights: - new drivers for Intel ismt & Broadcom bcm2835 - a number of drivers got support for more variants and mostly got cleaned up on the way (sis630, i801, at91, tegra, designware) - i2c got rid of all *_set_drvdata(..., NULL) on remove/probe failure - removed the i2c_smbus_process_call from the core since there are no users - mxs can now switch between PIO and DMA depending on the message size and the bus speed can now be arbitrary In addition, there is the usual bunch of fixes, cleanups, devm_* conversions, etc" Fixed conflict (and buggy devm_* conversion) in i2c-s3c2410.c * 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (39 commits) i2c: Remove unneeded xxx_set_drvdata(..., NULL) calls i2c: pxa: remove incorrect __exit annotations i2c: ocores: Fix pointer to integer cast warning i2c: tegra: remove warning dump if timeout happen in transfer i2c: fix i2c-ismt.c printk format warning i2c: i801: Add Device IDs for Intel Wellsburg PCH i2c: add bcm2835 driver i2c: ismt: Add Seth and Myself as maintainers i2c: sis630: checkpatch cleanup i2c: sis630: display unsigned hex i2c: sis630: use hex to constants for SMBus commands i2c: sis630: fix behavior after collision i2c: sis630: clear sticky bits i2c: sis630: Add SIS964 support i2c: isch: Add module parameter for backbone clock rate if divider is unset i2c: at91: fix unsed variable warning when building with !CONFIG_OF i2c: Adding support for Intel iSMT SMBus 2.0 host controller i2c: sh_mobile: don't send a stop condition by default inside transfers i2c: sh_mobile: eliminate an open-coded "goto" loop i2c: sh_mobile: fix timeout error handling ...
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS7
1 files changed, 7 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index ec9b7d2aa6a..1e5c3a4ece7 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3852,6 +3852,13 @@ F: drivers/i2c/busses/i2c-sis96x.c
3852F: drivers/i2c/busses/i2c-via.c 3852F: drivers/i2c/busses/i2c-via.c
3853F: drivers/i2c/busses/i2c-viapro.c 3853F: drivers/i2c/busses/i2c-viapro.c
3854 3854
3855I2C/SMBUS ISMT DRIVER
3856M: Seth Heasley <seth.heasley@intel.com>
3857M: Neil Horman <nhorman@tuxdriver.com>
3858L: linux-i2c@vger.kernel.org
3859F: drivers/i2c/busses/i2c-ismt.c
3860F: Documentation/i2c/busses/i2c-ismt
3861
3855I2C/SMBUS STUB DRIVER 3862I2C/SMBUS STUB DRIVER
3856M: "Mark M. Hoffman" <mhoffman@lightlink.com> 3863M: "Mark M. Hoffman" <mhoffman@lightlink.com>
3857L: linux-i2c@vger.kernel.org 3864L: linux-i2c@vger.kernel.org