Merge branch 'mmci' into amba
authorRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 24 Mar 2012 00:10:36 +0000 (00:10 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 24 Mar 2012 00:10:36 +0000 (00:10 +0000)
1  2 
drivers/mmc/host/mmci.c

Simple merge