Arnd Bergmann 928a11ba36 Merge branch 'next/cleanup' into samsung/dt ... Conflicts: arch/arm/mach-exynos/common.c The common.c file gets changes from rmk/stable-devel (part of next/cleanup), rmk/restart, samsung/dt and follow-on branches from the samsung tree. Pulling it all together here hopefully avoids having to do even more conflicting merge changesets in this one file. What a mess! Signed-off-by: Arnd Bergmann <arnd@arndb.de>		2012-01-07 20:23: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 'next/cleanup' into samsung/dt	2012-01-07 20:23:00 +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