Merge branch 'android-2.6.36' into android-tegra-2.6.36
authorColin Cross <ccross@android.com>
Fri, 29 Oct 2010 00:53:24 +0000 (17:53 -0700)
committerColin Cross <ccross@android.com>
Fri, 29 Oct 2010 00:53:24 +0000 (17:53 -0700)
commit4dfda9f3b7a3986ab452b3e214a13805ed1acdd4
tree902548c211059a9ecc196b9e00418e71c8348cf9
parentcad4b96fa6dc283698b5a9c2aaf8ccdf7d43861a
parent762476fa24df17914e1a8fab42e12d59da87539a
Merge branch 'android-2.6.36' into android-tegra-2.6.36
drivers/mmc/host/sdhci.c