Merge branch 'android-2.6.36' into android-tegra-2.6.36
authorColin Cross <ccross@android.com>
Thu, 7 Oct 2010 00:51:38 +0000 (17:51 -0700)
committerColin Cross <ccross@android.com>
Thu, 7 Oct 2010 00:51:38 +0000 (17:51 -0700)
commitb5122a1d3af28ec32c602ef672e84ca6ac74ec5a
treee8520b5c6f952701b7bfb62c803030dfe29ead5e
parent72d718a1f31122c91de76b54f86558d598c96beb
parenta325b6aa4ebe98ecb46268eb36e8a6c49696698b
Merge branch 'android-2.6.36' into android-tegra-2.6.36
drivers/mmc/core/sdio.c