Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
authorColin Cross <ccross@android.com>
Fri, 29 Oct 2010 04:03:22 +0000 (21:03 -0700)
committerColin Cross <ccross@android.com>
Fri, 29 Oct 2010 04:03:22 +0000 (21:03 -0700)
commitb4ec1b2a52cd1600a6cf37cc2ab43fdd77e8a4b3
tree3b8e8f172d7b2618180a63bc3423f84be4108793
parent7647d584a7ce3672cc787d95806d27c252a57d71
parent5ae7dfe2611bf0e4e178307ce812b82fe8a3458b
Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36

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

Change-Id: I9716a3c3a89d9a442d662cc402e1e4fdde1c3be4
drivers/mmc/host/sdhci-tegra.c