Merge branch 'korg-android-tegra-3.1' into after-upstream-android
authorDan Willemsen <dwillemsen@nvidia.com>
Thu, 1 Dec 2011 05:51:56 +0000 (21:51 -0800)
committerDan Willemsen <dwillemsen@nvidia.com>
Thu, 1 Dec 2011 05:51:56 +0000 (21:51 -0800)
commit68529c0f36074be88ee937634fb9433e69c96388
tree00c842c0eff6a2b946e1c11a1bdf2d632535e0a7
parentf9a10833c7a12ce1244685eba88848bb88bbd43f
parent3ac6e2e8106ac304c56b9435c907b2b3bda27a09
Merge branch 'korg-android-tegra-3.1' into after-upstream-android

Conflicts:
arch/arm/mach-tegra/Kconfig
arch/arm/mach-tegra/board-ventana.c
drivers/misc/Kconfig
drivers/video/tegra/dc/hdmi.c

Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>
21 files changed:
arch/arm/Kconfig
arch/arm/include/asm/cacheflush.h
arch/arm/mach-tegra/Kconfig
arch/arm/mach-tegra/Makefile
arch/arm/mach-tegra/board-ventana.c
arch/arm/mach-tegra/tegra_i2s_audio.c
arch/arm/mach-tegra/tegra_spdif_audio.c
drivers/base/power/runtime.c
drivers/cpufreq/cpufreq_stats.c
drivers/input/misc/Kconfig
drivers/input/misc/Makefile
drivers/misc/Kconfig
drivers/misc/Makefile
drivers/mmc/host/sdhci.c
drivers/net/Makefile
drivers/rtc/Kconfig
drivers/rtc/Makefile
drivers/usb/gadget/Makefile
drivers/usb/host/ehci.h
drivers/usb/otg/Makefile
drivers/video/tegra/dc/hdmi.c