diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-16 17:41:26 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-16 17:41:26 -0800 |
| commit | 123df7ae0d0ed90d01ef4cb7316fa0b7ef0ec8a8 (patch) | |
| tree | 85eea4f489152f0559abfcfeb94d100ef446278b /MAINTAINERS | |
| parent | 9b690c3d56ce15dd265b6398f9d8d58c29c17032 (diff) | |
| parent | a1681781da691a95c2277d9dbd7f5962b6b9e368 (diff) | |
| download | blackbird-op-linux-123df7ae0d0ed90d01ef4cb7316fa0b7ef0ec8a8.tar.gz blackbird-op-linux-123df7ae0d0ed90d01ef4cb7316fa0b7ef0ec8a8.zip | |
Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
Pull i2c update from Jean Delvare:
"This is my last pull request for the i2c subsystem. It includes all
the patches I collected between kernel v3.7-rc1 and me passing i2c
maintenance duties over to Wolfram.
Future patches to the many i2c bus drivers I still maintain will go
through Wolfram's tree."
* 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
i2c: Mention functionality flags in SMBus protocol documentation
i2c-piix4: Convert dev_printk(KERN_<LEVEL> to dev_<level>(
i2c-i801: Enable interrupts for all post-ICH5 chips
i2c-i801: Add device tree support
MAINTAINERS: Fix drivers/i2c/busses/i2c-stub.c
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index f71d2f901a69..d9c31b906ac9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3712,7 +3712,7 @@ I2C/SMBUS STUB DRIVER M: "Mark M. Hoffman" <mhoffman@lightlink.com> L: linux-i2c@vger.kernel.org S: Maintained -F: drivers/i2c/busses/i2c-stub.c +F: drivers/i2c/i2c-stub.c I2C SUBSYSTEM M: Wolfram Sang <w.sang@pengutronix.de> |
