Merge branch 'android-2.6.36' into android-tegra-2.6.36
authorColin Cross <ccross@android.com>
Fri, 10 Jun 2011 00:48:27 +0000 (17:48 -0700)
committerColin Cross <ccross@android.com>
Fri, 10 Jun 2011 00:48:27 +0000 (17:48 -0700)
commit321fc8e64a54be22308bee68eaafd81672eb6c45
tree070804e3ba717fadc814fefcd7bb98141e201997
parent1dfd911585f4376e4859db0fbb26b8fb39cf0951
parent461b3c034b82dff7d7ced336aeed61dd0064bf07
Merge branch 'android-2.6.36' into android-tegra-2.6.36

Conflicts:
drivers/mmc/host/sdhci.c

Change-Id: I9a048b52a7f82631caf222c5f273265bb9927675
drivers/mmc/host/sdhci.c
drivers/mmc/host/sdhci.h