Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
authorColin Cross <ccross@android.com>
Tue, 9 Nov 2010 23:50:14 +0000 (15:50 -0800)
committerColin Cross <ccross@android.com>
Tue, 9 Nov 2010 23:50:14 +0000 (15:50 -0800)
commit82d09352796fa1909c358673c51fdc83fd4dcdb5
treef2544fceed8de8059199d24541ed92d8e8bbfe41
parent0df61f8fcdea3835a0eeac78c6997c4e3a1ef8ba
parent1b7aeb98256b733251847db1750626b710d4fba1
Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36

Conflicts:
drivers/mmc/host/sdhci-tegra.c

Change-Id: Id44ce43b0c17f1f3e917b8c7ebfd213790e8e0e1
arch/arm/mach-tegra/Kconfig
drivers/mmc/host/sdhci-tegra.c