Merge branch 'android-2.6.36' into android-tegra-2.6.36
authorColin Cross <ccross@android.com>
Thu, 9 Jun 2011 23:56:13 +0000 (16:56 -0700)
committerColin Cross <ccross@android.com>
Thu, 9 Jun 2011 23:56:13 +0000 (16:56 -0700)
commitff4ab57e13148d97951a98a025a920eb4c672368
tree35b89db6d5e26da92818ec3abe572f2f92abac0c
parentf48009c2b34be347f5e9ecac11b75a848cc82b4d
parent64434eca54499db77943c59621d6413cfacc1654
Merge branch 'android-2.6.36' into android-tegra-2.6.36

Conflicts:
drivers/mmc/host/sdhci.h

Change-Id: I2ae744c0e7aa662e9e2c4e3ec1654877f172f747
drivers/mmc/host/sdhci.h