From: Linus Torvalds Date: Mon, 26 Jan 2009 23:11:41 +0000 (-0800) Subject: Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 X-Git-Tag: v2.6.29-rc3~21 X-Git-Url: http://pilppa.org/gitweb/?a=commitdiff_plain;h=cfb901bf84fe22eb86525e9fb20675b53fb0462a;p=linux-2.6-omap-h63xx.git 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: i2c: Warn on deprecated binding model use eeprom: More consistent symbol names eeprom: Move 93cx6 eeprom driver to /drivers/misc/eeprom spi: Move at25 (for SPI eeproms) to /drivers/misc/eeprom i2c: Move old eeprom driver to /drivers/misc/eeprom i2c: Move at24 to drivers/misc/eeprom i2c: Quilt tree has moved i2c: Delete many unused adapter IDs i2c: Delete 10 unused driver IDs --- cfb901bf84fe22eb86525e9fb20675b53fb0462a