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)
commit9e6be8775918dae6bc03b94bf04ab154be473f13
tree47676c02a2db8a0b868d7e902519cbfbea4b8a63
parentb71554c9af41a129f0c091a148649bc72c811916
parent4d86495ef99f6a8de7154794eeb765001658e44c
Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
arch/arm/mach-tegra/tegra2_clocks.c
drivers/mmc/host/sdhci-tegra.c