Grant Likely 9c3c8afccb Merge commit 'v2.6.38-rc8' into spi/next ... Conflicts: drivers/spi/pxa2xx_spi_pci.c		2011-03-12 01:25:53 -07:00
..
card	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-01-13 10:05:56 -08:00
core	mmc: sdio: Allow sdio operations in other threads during sdio_add_func()	2011-03-07 16:55:44 -05:00
host	of_mmc_spi: add card detect irq support	2011-03-07 20:45:28 -07: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