Arnd Bergmann f907ab06bb Merge branch 'next/fixes-non-critical' into next/drivers ... Conflicts: arch/arm/mach-lpc32xx/clock.c arch/arm/mach-pxa/pxa25x.c arch/arm/mach-pxa/pxa27x.c The conflicts with pxa are non-obvious, we have multiple branches adding and removing the same clock settings. According to Haojian Zhuang, removing the sa1100 rtc dummy clock is the correct fix here. Signed-off-by: Arnd Bergmann <arnd@arndb.de>		2012-03-20 22:42:24 +00:00
..
card	mmc: block: Init ro_lock sysfs attr to fix lockdep warnings	2012-02-13 20:39:04 -05:00
core	mmc: core: Fixup suspend/resume issues for UHS-I cards	2012-03-04 12:25:15 -05:00
host	Merge branch 'next/fixes-non-critical' into next/drivers	2012-03-20 22:42:24 +00:00
Kconfig	mmc: explicitly mention SDIO support in Kconfig	2008-10-12 11:04:36 +02:00
Makefile	mmc: sdhci-pci: add platform data	2012-01-11 23:58:47 -05:00