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

diff --cc arch/sh/configs/edosk7760_defconfig
Simple merge

diff --cc arch/sh/configs/migor_defconfig
Simple merge

diff --cc arch/sh/configs/r7780mp_defconfig
Simple merge

diff --cc arch/sh/configs/r7785rp_defconfig
Simple merge

diff --cc arch/sh/configs/rts7751r2d1_defconfig
Simple merge

diff --cc arch/sh/configs/rts7751r2dplus_defconfig
Simple merge

diff --cc arch/sh/configs/se7343_defconfig
Simple merge

diff --cc arch/sh/configs/sh7785lcr_defconfig
Simple merge

diff --cc arch/sh/configs/shx3_defconfig
Simple merge