]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'block/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 3 Nov 2011 04:05:09 +0000 (15:05 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 3 Nov 2011 04:05:09 +0000 (15:05 +1100)
commita46c15238c6398a6c631949ab59d439a1c270154
treeaa5c7ca13aeaf92d1e08cbc71da52e6a5a27336d
parentcdaa31ee1576c2d5fe49c94e6351cee2e31398fc
parenta2da99861ffdba68bc436ffbe034731f23177672
Merge remote-tracking branch 'block/for-next'

Conflicts:
drivers/md/faulty.c
drivers/md/linear.c
drivers/md/md.c
drivers/md/md.h
drivers/md/multipath.c
drivers/md/raid0.c
drivers/md/raid1.c
drivers/md/raid10.c
drivers/md/raid5.c
drivers/staging/zram/zram_drv.c
17 files changed:
block/genhd.c
drivers/block/drbd/drbd_int.h
drivers/block/xen-blkback/blkback.c
drivers/block/xen-blkback/common.h
drivers/md/dm.c
drivers/md/faulty.c
drivers/md/linear.c
drivers/md/md.c
drivers/md/md.h
drivers/md/multipath.c
drivers/md/raid0.c
drivers/md/raid1.c
drivers/md/raid10.c
drivers/md/raid5.c
drivers/scsi/hpsa.c
drivers/staging/zram/zram_drv.c
include/linux/genhd.h