Merge branch 'common/mmcif' into rmobile/mmcif
authorPaul Mundt <lethal@linux-sh.org>
Tue, 30 Nov 2010 05:42:55 +0000 (14:42 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Tue, 30 Nov 2010 05:42:55 +0000 (14:42 +0900)
1  2 
include/linux/mmc/sh_mmcif.h

Simple merge