Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
authorColin Cross <ccross@android.com>
Thu, 9 Dec 2010 03:55:07 +0000 (19:55 -0800)
committerColin Cross <ccross@android.com>
Thu, 9 Dec 2010 03:55:07 +0000 (19:55 -0800)
commit76bf6ee37a5956604031e2137c00a5eabb3b38fe
tree3656d5695e4e7d11be996aa96ad9b475548ee2a6
parent0cff1ca8038dc2ab682033f4f190e7edece5762e
parent42907f1736fe39cdf39b5f583fcd6b9e4e257b18
Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
arch/arm/mach-tegra/Kconfig
arch/arm/mach-tegra/Makefile
arch/arm/mach-tegra/tegra2_clocks.c