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	[S390] qdio: remove dead timeout handler	2009-04-14 15:37:24 +02:00
crypto	[S390] use kzfree()	2009-03-26 15:24:29 +01:00
kvm	s390: remove s390_root_dev_*()	2009-01-06 10:44:34 -08:00
net	qeth: properly delete empty files.	2009-04-01 12:51:33 -07:00
scsi	[SCSI] zfcp: Fix oops when port disappears	2009-04-27 10:07:37 -05:00
Makefile	[S390] split/move machine check handler code	2009-03-26 15:24:10 +01:00