Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
authorColin Cross <ccross@android.com>
Thu, 30 Dec 2010 00:16:20 +0000 (16:16 -0800)
committerColin Cross <ccross@android.com>
Thu, 30 Dec 2010 00:16:20 +0000 (16:16 -0800)
1  2 
arch/arm/mach-tegra/tegra2_clocks.c
drivers/mmc/host/sdhci-tegra.c

Simple merge
Simple merge