Merge branch 'master' of ../mmc
Pierre Ossman [Wed, 31 Dec 2008 18:56:05 +0000 (19:56 +0100)]
1  2 
drivers/mmc/host/sdricoh_cs.c

Simple merge