Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:

	drivers/i2c/chips/Kconfig
	drivers/i2c/chips/Makefile
	drivers/leds/Makefile

diff --cc Makefile
Simple merge

diff --cc drivers/hwmon/Kconfig
Simple merge

diff --cc drivers/hwmon/Makefile
Simple merge

diff --cc drivers/i2c/chips/Kconfig
index 744ecbcc450cc6b690e22f19c35239fa90fd1f07,b9bef04b7be4fffb9eace1743621e98f7d0d47eb..4c27f8ae7d8aca8ed6d374f6478b2aa2db108a24
--- 1/drivers/i2c/chips/Kconfig
--- 2/drivers/i2c/chips/Kconfig
+++ b/drivers/i2c/chips/Kconfig
@@@ -168,42 -139,4 +168,31 @@@ config SENSORS_TSL255
          This driver can also be built as a module.  If so, the module
          will be called tsl2550.
  
- config MCU_MPC8349EMITX
-       tristate "MPC8349E-mITX MCU driver"
-       depends on I2C && PPC_83xx
-       select GENERIC_GPIO
-       select ARCH_REQUIRE_GPIOLIB
-       help
-         Say Y here to enable soft power-off functionality on the Freescale
-         boards with the MPC8349E-mITX-compatible MCU chips. This driver will
-         also register MCU GPIOs with the generic GPIO API, so you'll able
-         to use MCU pins as GPIOs.
- 
 +config SENSORS_TSL2563
 +       tristate "Taos TSL2563 ambient light sensor"
 +       depends on I2C && HWMON
 +       help
 +         If you say yes here you get support for the Taos TSL2563
 +         ambient light sensor.
 +
 +         This driver can also be built as a module.  If so, the module
 +         will be called tsl2563.
 +
 +config LP5521
 +      tristate "LP5521 LED driver chip"
 +      depends on I2C
 +      help
 +        If you say yes here you get support for the National Semiconductor
 +        LP5521 LED driver.
 +
 +config MENELAUS
 +      bool "TWL92330/Menelaus PM chip"
 +      depends on I2C=y && ARCH_OMAP24XX
 +      help
 +        If you say yes here you get support for the Texas Instruments
 +        TWL92330/Menelaus Power Management chip. This include voltage
 +        regulators, Dual slot memory card tranceivers, real-time clock
 +        and other features that are often used in portable devices like
 +        cell phones and PDAs.
 +
  endmenu

diff --cc drivers/i2c/chips/Makefile
index ffd8d0d1909dc9b5559b4e31d329d18834ebdfbe,00fcb5193ac2c2fbe814193cfce09d114abe3631..b451369092cadef33c0cc5d6e1a47ea42251a76b
--- 1/drivers/i2c/chips/Makefile
--- 2/drivers/i2c/chips/Makefile
+++ b/drivers/i2c/chips/Makefile
@@@ -18,14 -18,7 +18,13 @@@ obj-$(CONFIG_SENSORS_PCA9539)       += pca953
  obj-$(CONFIG_SENSORS_PCF8574) += pcf8574.o
  obj-$(CONFIG_PCF8575)         += pcf8575.o
  obj-$(CONFIG_SENSORS_PCF8591) += pcf8591.o
 +obj-$(CONFIG_MENELAUS)                += menelaus.o
  obj-$(CONFIG_SENSORS_TSL2550) += tsl2550.o
- obj-$(CONFIG_MCU_MPC8349EMITX)        += mcu_mpc8349emitx.o
 +obj-$(CONFIG_TWL4030_POWEROFF)        += twl4030-poweroff.o
 +obj-$(CONFIG_TWL4030_PWRBUTTON)       += twl4030-pwrbutton.o
 +obj-$(CONFIG_TWL4030_MADC)    += twl4030-madc.o
 +obj-$(CONFIG_RTC_X1205_I2C)   += x1205.o
 +obj-$(CONFIG_LP5521)          += lp5521.o
  
  ifeq ($(CONFIG_I2C_DEBUG_CHIP),y)
  EXTRA_CFLAGS += -DDEBUG

diff --cc drivers/leds/Kconfig
Simple merge

diff --cc drivers/leds/Makefile
Simple merge

diff --cc drivers/mfd/Kconfig
Simple merge

diff --cc drivers/mfd/Makefile
Simple merge

diff --cc drivers/mfd/twl4030-core.c
index 7e7f0db2005d74bef2450ccea9923e733f62b8a8,e7ab0035d3054fdfd159b48c9e548150758b986b..19ee29b77517ff953f81841eddde64841728e561
--- 1/drivers/mfd/twl4030-core.c
--- 2/drivers/mfd/twl4030-core.c
+++ b/drivers/mfd/twl4030-core.c
@@@ -784,12 -776,8 +784,12 @@@ twl4030_probe(struct i2c_client *client
        inuse = true;
  
        /* setup clock framework */
-       clocks_init();
+       clocks_init(&client->dev);
  
 +      /* load power event scripts */
 +      if (twl_has_power() && pdata->power)
 +              twl4030_power_init(pdata->power);
 +
        /* Maybe init the T2 Interrupt subsystem */
        if (client->irq
                        && pdata->irq_base

diff --cc drivers/misc/Makefile
Simple merge

diff --cc drivers/power/Kconfig
Simple merge

diff --cc drivers/power/Makefile
Simple merge

diff --cc drivers/regulator/Kconfig
Simple merge

diff --cc drivers/regulator/Makefile
Simple merge

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

diff --cc drivers/watchdog/Kconfig
Simple merge

diff --cc include/linux/connector.h
Simple merge

diff --cc kernel/printk.c
Simple merge