Merge branch 'android-2.6.36' into android-tegra-2.6.36
authorColin Cross <ccross@android.com>
Wed, 6 Oct 2010 23:31:32 +0000 (16:31 -0700)
committerColin Cross <ccross@android.com>
Wed, 6 Oct 2010 23:32:09 +0000 (16:32 -0700)
commit98959c85632cde43fc83ba1b709f767fc3b8a4ee
treebe7912bc7cd8c2aab86922da933439ff951ab602
parent5c4a97667fdf6705d6c9f9e4b42dd7deb4da6978
parentdf5ac72e83df9fd8d735d40d5be464d4b66d6074
Merge branch 'android-2.6.36' into android-tegra-2.6.36

Conflicts:
drivers/input/touchscreen/Kconfig

Change-Id: Ifc75266e258f9513d78c47c12e2f1de1d2344f02
arch/arm/kernel/process.c
drivers/input/touchscreen/Kconfig
drivers/input/touchscreen/Makefile
drivers/mmc/core/sdio.c
drivers/rtc/Kconfig
drivers/rtc/Makefile
drivers/usb/gadget/Kconfig
drivers/usb/gadget/Makefile
include/linux/mmc/host.h
include/linux/mmc/mmc.h