Merge branch 'android-2.6.36' into android-tegra-2.6.36

Conflicts:
	drivers/input/touchscreen/Kconfig

Change-Id: Ifc75266e258f9513d78c47c12e2f1de1d2344f02

diff --cc arch/arm/kernel/process.c
Simple merge

diff --cc drivers/input/touchscreen/Kconfig
index cab10a00e4146bf85c2b940807e874d12872f140,4098eb8f7de6c0d7316f9bfb1b9bb9590b9b2381..d50fd5603604007baf63c47d97561dfc16ea6cad
--- 1/drivers/input/touchscreen/Kconfig
--- 2/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@@ -328,19 -328,12 +328,25 @@@ config TOUCHSCREEN_MIGO
          To compile this driver as a module, choose M here: the
          module will be called migor_ts.
  
 +config TOUCHSCREEN_PANJIT_I2C
 +      tristate "PANJIT I2C touchscreen driver"
 +      depends on I2C
 +      default n
 +      help
 +        Say Y here to enable PANJIT I2C capacitive touchscreen support,
 +        covering devices such as the MGG1010AI06 and EGG1010AI06
 +
 +        If unsure, say N
 +
 +        To compile this driver as a module, choose M here: the module will
 +        be called panjit_i2c.
 +
+ config TOUCHSCREEN_SYNAPTICS_I2C_RMI
+       tristate "Synaptics i2c touchscreen"
+       depends on I2C
+       help
+         This enables support for Synaptics RMI over I2C based touchscreens.
+ 
  config TOUCHSCREEN_TOUCHRIGHT
        tristate "Touchright serial touchscreen"
        select SERIO

diff --cc drivers/input/touchscreen/Makefile
Simple merge

diff --cc drivers/mmc/core/sdio.c
Simple merge

diff --cc drivers/rtc/Kconfig
Simple merge

diff --cc drivers/rtc/Makefile
Simple merge

diff --cc drivers/usb/gadget/Kconfig
Simple merge

diff --cc drivers/usb/gadget/Makefile
Simple merge

diff --cc include/linux/mmc/host.h
Simple merge

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