mmc: host: sdhci: Resolve incorrect merge
authorColin Cross <ccross@android.com>
Fri, 10 Jun 2011 00:44:13 +0000 (17:44 -0700)
committerColin Cross <ccross@android.com>
Fri, 10 Jun 2011 00:44:13 +0000 (17:44 -0700)
commit461b3c034b82dff7d7ced336aeed61dd0064bf07
tree9aaf368b7bd67440e003804f6c45e812b6d03c56
parentaff0e8a8fe0e05b33785f2d0fd19f1e108c41142
mmc: host: sdhci: Resolve incorrect merge

Change-Id: Ic91f35fbb1f0a131d8ab56817f0ad91288c82402
Signed-off-by: Colin Cross <ccross@android.com>
drivers/mmc/host/sdhci.c