Merge branch 'android-2.6.36' into android-tegra-2.6.36
authorColin Cross <ccross@android.com>
Sat, 12 Feb 2011 22:13:19 +0000 (14:13 -0800)
committerColin Cross <ccross@android.com>
Sat, 12 Feb 2011 22:13:19 +0000 (14:13 -0800)
commit87666eb18a15ffecfbd6108a9e2cb0d54e33ec99
treeca3cdf277886299212f52471dcae6fa9b683802e
parentfd4194e5c3ab51f0eacdc115eeead02dbf8f4d88
parent1cd64ef5c1becb1c70c432bdcae98fdb686a8173
Merge branch 'android-2.6.36' into android-tegra-2.6.36
include/linux/mmc/mmc.h