Jens Axboe 9bd7de51ee Merge branch 'master' into for-2.6.31 ... Conflicts: drivers/ide/ide-io.c Signed-off-by: Jens Axboe <jens.axboe@oracle.com>		2009-05-22 20:28:35 +02:00
..
card	Merge branch 'master' into for-2.6.31	2009-05-22 20:25:34 +02:00
core	mmc: increase power up delay	2009-05-03 22:11:31 +02:00
host	[ARM] 5519/1: amba probe: pass "struct amba_id *" instead of void *	2009-05-20 23:26:51 +01:00
Kconfig	mmc: explicitly mention SDIO support in Kconfig	2008-10-12 11:04:36 +02:00
Makefile	mmc: Move core functions to subdir	2007-05-01 13:04:18 +02:00