diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-04 17:46:27 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-04 17:46:27 -0700 |
| commit | 8d41f0e8d51742aba5bbcab9acb5238a8578c917 (patch) | |
| tree | c69e7ffaf2a8598283422d20643154a298d08293 /MAINTAINERS | |
| parent | 8bc8493063f938c932819958a7b5a0d56046bc96 (diff) | |
| parent | 5b68790cd5e2879067bcbc45b01eeb6081e7d731 (diff) | |
Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
* 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6: (44 commits)
i2c-s3c2410: Fix bug in releasing driver
i2c-s3c2410: Fix I2C SDA to SCL setup time
i2c: New i2c-tiny-usb bus driver
i2c: Documentation update
i2c: SPIN_LOCK_UNLOCKED cleanup
i2c: Obsolete i2c-ixp2000, i2c-ixp4xx and scx200_i2c
i2c: New Simtec I2C bus driver
i2c: Bitbanging I2C bus driver using the GPIO API
Use menuconfig objects - I2C
i2c: Restore i2c_smbus_read_block_data
i2c-pxa: Clean transaction stop
i2c-algo-bit: Improve debugging
i2c-algo-bit: Implement a 50/50 SCL duty cycle
i2c-omap: Switch to static adapter numbering
i2c: Blackfin Two Wire Interface driver
i2c-algo-sgi: Comment and whitespace cleanups
i2c: Make i2c_del_driver a void function
i2c: Move i2c-isa-only exported symbol declarations
i2c: Document i2c_new_device()
i2c: Add i2c_new_probed_device()
...
Fixed trivial conflict in Documentation/feature-removal-schedule.txt manually.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 17c5e30f20f..1e8c37054ea 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -733,6 +733,13 @@ M: tigran@aivazian.fsnet.co.uk L: linux-kernel@vger.kernel.org S: Maintained +BLACKFIN I2C TWI DRIVER +P: Sonic Zhang +M: sonic.zhang@analog.com +L: uclinux-dist-devel@blackfin.uclinux.org (subscribers-only) +W: http://blackfin.uclinux.org/ +S: Supported + BLOCK LAYER P: Jens Axboe M: axboe@kernel.dk @@ -1459,6 +1466,11 @@ L: linux-scsi@vger.kernel.org W: http://www.icp-vortex.com/ S: Supported +GENERIC GPIO I2C DRIVER +P: Haavard Skinnemoen +M: hskinnemoen@atmel.com +S: Supported + GENERIC HDLC DRIVER, N2, C101, PCI200SYN and WANXL DRIVERS P: Krzysztof Halasa M: khc@pm.waw.pl @@ -1631,6 +1643,13 @@ L: i2c@lm-sensors.org T: quilt http://khali.linux-fr.org/devel/linux-2.6/jdelvare-i2c/ S: Maintained +I2C-TINY-USB DRIVER +P: Till Harbaum +M: till@harbaum.org +L: i2c@lm-sensors.org +T: http://www.harbaum.org/till/i2c_tiny_usb +S: Maintained + i386 BOOT CODE P: Riley H. Williams M: Riley@Williams.Name |