Jens Axboe 5c04b426f2 Merge branch 'v3.1-rc10' into for-3.2/core ... Conflicts: block/blk-core.c include/linux/blkdev.h Signed-off-by: Jens Axboe <axboe@kernel.dk>		2011-10-19 14:30:42 +02:00
..
block	Merge branch 'v3.1-rc10' into for-3.2/core	2011-10-19 14:30:42 +02:00
char	[S390] memory hotplug: only unassign assigned increments	2011-08-24 17:15:24 +02:00
cio	[S390] cio: fix cio_tpi ignoring adapter interrupts	2011-09-26 16:40:50 +02:00
crypto	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00
kvm	[S390] irq: merge irq.c and s390_ext.c	2011-05-26 09:48:24 +02:00
net	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00
scsi	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00
Makefile	[S390] split/move machine check handler code	2009-03-26 15:24:10 +01:00