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)
1  2 
include/linux/mmc/host.h

Simple merge