Paul Mundt 5e93c6b4ec Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into rmobile-latest ... Conflicts: arch/arm/mach-shmobile/Kconfig Signed-off-by: Paul Mundt <lethal@linux-sh.org>		2011-01-07 10:29:26 +09:00
..
card	mmc: make number of mmcblk minors configurable	2010-10-25 09:28:46 +08:00
core	mmc: Fix re-probing with PM_POST_RESTORE notification	2010-12-21 11:46:49 -08:00
host	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into rmobile-latest	2011-01-07 10:29:26 +09:00
Kconfig	mmc: explicitly mention SDIO support in Kconfig	2008-10-12 11:04:36 +02:00
Makefile	mmc: Makefile: Fix EXTRA_CFLAGS assignment	2010-10-23 21:11:15 +08:00