Jens Axboe e4b636366c Merge branch 'master' into for-2.6.31 ...

Conflicts:
	drivers/block/hd.c
	drivers/block/mg_disk.c

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

2009-05-22 20:25:34 +02:00

..

block.c

Merge branch 'master' into for-2.6.31

2009-05-22 20:25:34 +02:00

Kconfig

mmc: explicitly mention SDIO support in Kconfig

2008-10-12 11:04:36 +02:00

Makefile

mmc: mmc host test driver

2008-05-14 21:02:16 +02:00

mmc_test.c

mmc_test: fix basic read test

2009-02-18 21:01:14 +01:00

queue.c

block: implement and enforce request peek/start/fetch

2009-05-11 09:52:18 +02:00

queue.h

mmc: bounce requests for simple hosts

2007-07-09 21:22:53 +02:00

sdio_uart.c

proc tty: switch sdio_uart to ->proc_fops

2009-04-01 08:59:09 -07:00