Merge branch 'master' of ../mmc
authorPierre Ossman <drzeus@drzeus.cx>
Wed, 31 Dec 2008 18:56:05 +0000 (19:56 +0100)
committerPierre Ossman <drzeus@drzeus.cx>
Wed, 31 Dec 2008 18:56:05 +0000 (19:56 +0100)
commit418f19ea17a99421b22a64e101e14b6a16bed66d
tree7c21fcc368c63f1f9907deac6d16b30bd371792d
parent98444d3dd975653a4a970ecc0dfc30918da92f60
parentf6e10b865c3ea56bdaa8c6ecfee313b997900dbb
Merge branch 'master' of ../mmc
drivers/mmc/host/sdricoh_cs.c