1
0
Fork 0
alistair23-linux/drivers/s390
Jens Axboe 4c63f5646e Merge branch 'for-2.6.39/stack-plug' into for-2.6.39/core
Conflicts:
	block/blk-core.c
	block/blk-flush.c
	drivers/md/raid1.c
	drivers/md/raid10.c
	drivers/md/raid5.c
	fs/nilfs2/btnode.c
	fs/nilfs2/mdt.c

Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
2011-03-10 08:58:35 +01:00
..
block block: remove per-queue plugging 2011-03-10 08:52:07 +01:00
char Merge branch 'for-2.6.39/stack-plug' into for-2.6.39/core 2011-03-10 08:58:35 +01:00
cio [S390] qdio: prevent compile warning under CONFIG_32BIT 2011-01-31 11:30:21 +01:00
crypto [S390] Handling of 4096 bit RSA keys in CRT format. 2011-01-05 12:47:27 +01:00
kvm [S390] irq: have detailed statistics for interrupt types 2011-01-05 12:47:25 +01:00
net s390: Fix possibly wrong size in strncmp (smsgiucv) 2011-02-02 15:00:02 -08:00
scsi Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2011-01-13 10:05:56 -08:00
Makefile [S390] split/move machine check handler code 2009-03-26 15:24:10 +01:00