Merge branch 'android-2.6.36' into android-tegra-2.6.36
authorColin Cross <ccross@android.com>
Thu, 14 Oct 2010 23:22:55 +0000 (16:22 -0700)
committerColin Cross <ccross@android.com>
Thu, 14 Oct 2010 23:22:55 +0000 (16:22 -0700)
commit5cb18262c713c8e2a007b81a4662cb2225b56211
tree1c6a0e1d43c92d00795b6accd5f8994ac862e1b3
parent40ab482b699f7d2807d2678ced16ba6b512ff54a
parenta46384364468ab78c8a6fb2857ac935c50c6d500
Merge branch 'android-2.6.36' into android-tegra-2.6.36
include/linux/mmc/host.h