Merge branch android-tegra-2.6.36 into android-tegra-moto-2.6.36
authorErik Gilling <konkers@android.com>
Wed, 27 Oct 2010 01:24:50 +0000 (18:24 -0700)
committerErik Gilling <konkers@android.com>
Wed, 27 Oct 2010 01:24:50 +0000 (18:24 -0700)
commit2afff3d793abe049442923fc5a1e4b5864408629
treef9e7bb7daf0b84db33501ce47c5ac436dd06d5a0
parentddc94c1701ab3ce0037547843cd338e33601b28b
parent588ff569ea3bd0b97666e88f146fc11da7bdb5b0
Merge branch android-tegra-2.6.36 into android-tegra-moto-2.6.36

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

Change-Id: I52c329c835d80d868c731b23ca2d9dfad6e6586e
arch/arm/mach-tegra/suspend.c
arch/arm/mach-tegra/tegra2_clocks.c
drivers/mmc/host/sdhci-tegra.c