Merge with mainline

diff --cc Makefile
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc drivers/Kconfig
Simple merge

diff --cc drivers/Makefile
index 5e594afa85f9d672d7b0612fcb3bd8a07d6d1a59,126a851d56538f8c336da54d3091d0491f470094..580fae71f36286bc9b7c902de398862de4a67f64
--- 1/drivers/Makefile
--- 2/drivers/Makefile
+++ b/drivers/Makefile
@@@ -52,7 -50,9 +52,8 @@@ obj-$(CONFIG_USB_GADGET)      += usb/gadget
  obj-$(CONFIG_GAMEPORT)                += input/gameport/
  obj-$(CONFIG_INPUT)           += input/
  obj-$(CONFIG_I2O)             += message/
 -obj-$(CONFIG_I2C)             += i2c/
  obj-$(CONFIG_W1)              += w1/
+ obj-$(CONFIG_HWMON)           += hwmon/
  obj-$(CONFIG_PHONE)           += telephony/
  obj-$(CONFIG_MD)              += md/
  obj-$(CONFIG_BT)              += bluetooth/

diff --cc drivers/char/Makefile
Simple merge

diff --cc drivers/i2c/chips/Makefile
index 6c5fab66a48b973153afe1332fdb68e69e99fcab,a876dd42b86060acd2de85aa6d1d1653002222d2..c60a38e588b9f9a422991e7c83c4e75ef0f7764e
--- 1/drivers/i2c/chips/Makefile
--- 2/drivers/i2c/chips/Makefile
+++ b/drivers/i2c/chips/Makefile
@@@ -40,17 -11,8 +11,10 @@@ obj-$(CONFIG_SENSORS_PCA9539)       += pca953
  obj-$(CONFIG_SENSORS_PCF8574) += pcf8574.o
  obj-$(CONFIG_SENSORS_PCF8591) += pcf8591.o
  obj-$(CONFIG_SENSORS_RTC8564) += rtc8564.o
- obj-$(CONFIG_SENSORS_SIS5595) += sis5595.o
- obj-$(CONFIG_SENSORS_SMSC47B397)+= smsc47b397.o
- obj-$(CONFIG_SENSORS_SMSC47M1)        += smsc47m1.o
- obj-$(CONFIG_SENSORS_VIA686A) += via686a.o
- obj-$(CONFIG_SENSORS_W83627EHF)       += w83627ehf.o
- obj-$(CONFIG_SENSORS_W83L785TS)       += w83l785ts.o
- 
  obj-$(CONFIG_ISP1301_OMAP)    += isp1301_omap.o
  obj-$(CONFIG_TPS65010)                += tps65010.o
 +obj-$(CONFIG_SENSORS_TLV320AIC23) += tlv320aic23.o
 +obj-$(CONFIG_GPIOEXPANDER_OMAP)       += gpio_expander_omap.o
  
  ifeq ($(CONFIG_I2C_DEBUG_CHIP),y)
  EXTRA_CFLAGS += -DDEBUG

diff --cc drivers/media/video/Kconfig
Simple merge

diff --cc drivers/mtd/nand/Kconfig
Simple merge

diff --cc drivers/mtd/nand/Makefile
Simple merge

diff --cc drivers/pcmcia/Kconfig
Simple merge

diff --cc drivers/serial/8250.c
Simple merge

diff --cc init/do_mounts.c
Simple merge