Arnd Bergmann a07613a54d Merge branch 'samsung/dt' into samsung/cleanup ... Conflicts: arch/arm/mach-s3c64xx/Makefile arch/arm/mach-s5pc100/Makefile arch/arm/mach-s5pv210/Makefile Pull in previously resolved conflicts: The Makefiles were reorganized in the "rmk/restart" series and modified in the "samsung/cleanup series". This also pulls in the other conflict resolutions from the restart series against the samsung/dt series. Signed-off-by: Arnd Bergmann <arnd@arndb.de>		2012-01-09 16:01:00 +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/dt' into samsung/cleanup	2012-01-09 16:01:00 +00:00
Kconfig
Makefile	mmc: Makefile: Fix EXTRA_CFLAGS assignment	2010-10-23 21:11:15 +08:00