tmp_suning_uos_patched/drivers/mmc
Russell King 2502991560 Merge branch 'fixes' into for-linus
Conflicts:

	arch/arm/mach-versatile/core.c
2008-10-15 23:16:07 +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 'fixes' into for-linus 2008-10-15 23:16:07 +01:00
Kconfig mmc: explicitly mention SDIO support in Kconfig 2008-10-12 11:04:36 +02:00
Makefile