Arnd Bergmann dcf7ec5ee6 Merge branch 'samsung/driver' into next/drivers ... Conflicts: arch/arm/mach-mxs/include/mach/common.h Pull in previous samsung conflict merges and do a trivial merge of an mxs double-add conflict. Signed-off-by: Arnd Bergmann <arnd@arndb.de>		2012-01-09 16:16:29 +00:00
..
card	mmc: core: Add quirk for long data read time	2011-12-10 16:18:35 -05:00
core	Revert "mmc: enable runtime PM by default"	2011-12-19 15:51:38 -08:00
host	Merge branch 'samsung/driver' into next/drivers	2012-01-09 16:16:29 +00: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