]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'block/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 4 Nov 2011 03:16:29 +0000 (14:16 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 4 Nov 2011 03:16:29 +0000 (14:16 +1100)
commitc0ca2c6c07b8ba701f62985a18ec661afd2b55bd
tree15301baf16cb18b16b42dc1bfb9f3c0250c6068d
parent0b1517537ee571fe0740a4eafa87dbff13e26e7c
parent30a4b71b611d75c73ad12e786f8f01b52b73ecba
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