linux/drivers/s390
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 block: implement and enforce request peek/start/fetch 2009-05-11 09:52:18 +02:00
char block: implement and enforce request peek/start/fetch 2009-05-11 09:52:18 +02:00
cio
crypto
kvm
net
scsi [SCSI] zfcp: Fix oops when port disappears 2009-04-27 10:07:37 -05:00
Makefile