Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
authorColin Cross <ccross@android.com>
Thu, 9 Jun 2011 23:56:27 +0000 (16:56 -0700)
committerColin Cross <ccross@android.com>
Thu, 9 Jun 2011 23:56:27 +0000 (16:56 -0700)
1  2 
drivers/mmc/host/sdhci-tegra.c

Simple merge