Merge branch 'korg-android-3.1' into korg-android+linux-tegra-3.1
authorDan Willemsen <dwillemsen@nvidia.com>
Thu, 1 Dec 2011 05:41:00 +0000 (21:41 -0800)
committerDan Willemsen <dwillemsen@nvidia.com>
Thu, 1 Dec 2011 05:41:00 +0000 (21:41 -0800)
commita70c0eab1897b2bb15d89f43267828682950842e
tree3b53319c93e0a73db1d8df5947e6ed621ccbb5df
parent83adb17804d48ead8fc91a8ab7dda81db13b9444
parent7f9ed524778bcdcd8a51bdeab2095655fb57c431
Merge branch 'korg-android-3.1' into korg-android+linux-tegra-3.1

Conflicts:
arch/arm/mm/cache-l2x0.c
drivers/misc/Kconfig
drivers/misc/Makefile

Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>
17 files changed:
arch/arm/Kconfig
arch/arm/include/asm/hardware/cache-l2x0.h
arch/arm/mm/cache-l2x0.c
arch/arm/vfp/vfpmodule.c
drivers/input/touchscreen/Kconfig
drivers/input/touchscreen/Makefile
drivers/misc/Kconfig
drivers/misc/Makefile
drivers/mmc/host/sdhci.c
drivers/rtc/Kconfig
drivers/rtc/Makefile
drivers/usb/gadget/Kconfig
drivers/usb/gadget/Makefile
drivers/usb/host/ehci-q.c
drivers/usb/otg/Kconfig
drivers/usb/otg/Makefile
drivers/video/Kconfig