Pierre Ossman 6ee6c6adf1 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/atmel-mci-2.6.28 ... Conflicts: drivers/mmc/host/atmel-mci.c		2008-10-12 11:08:46 +02:00
..
card	mmc: explicitly mention SDIO support in Kconfig	2008-10-12 11:04:36 +02:00
core	MMC: CSD and CID timeout values	2008-10-12 11:04:37 +02:00
host	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/atmel-mci-2.6.28	2008-10-12 11:08:46 +02:00
Kconfig	mmc: explicitly mention SDIO support in Kconfig	2008-10-12 11:04:36 +02:00
Makefile