David Woodhouse e758936e02 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 ... Conflicts: include/asm-x86/statfs.h		2008-10-13 17:13:56 +01:00
..
card	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc	2008-10-12 11:51:57 -07: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/torvalds/linux-2.6	2008-10-13 17:13:56 +01:00
Kconfig	mmc: explicitly mention SDIO support in Kconfig	2008-10-12 11:04:36 +02:00
Makefile