Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa...
Russell King [Sat, 7 Feb 2009 21:43:28 +0000 (21:43 +0000)]
Conflicts:

arch/arm/configs/magician_defconfig

1  2 
MAINTAINERS
arch/arm/configs/em_x270_defconfig
arch/arm/configs/magician_defconfig

diff --cc MAINTAINERS
Simple merge
Simple merge
@@@ -675,11 -751,11 +751,11 @@@ CONFIG_I2C_PXA=
  #
  # Miscellaneous I2C Chip support
  #
- # CONFIG_SENSORS_DS1337 is not set
- # CONFIG_SENSORS_DS1374 is not set
  # CONFIG_DS1682 is not set
+ # CONFIG_AT24 is not set
 -# CONFIG_SENSORS_EEPROM is not set
 +# CONFIG_EEPROM_LEGACY is not set
  # CONFIG_SENSORS_PCF8574 is not set
+ # CONFIG_PCF8575 is not set
  # CONFIG_SENSORS_PCA9539 is not set
  # CONFIG_SENSORS_PCF8591 is not set
  # CONFIG_SENSORS_MAX6875 is not set