Merge branch 'v3.1-rc10' into for-3.2/core
authorJens Axboe <axboe@kernel.dk>
Wed, 19 Oct 2011 12:30:42 +0000 (14:30 +0200)
committerJens Axboe <axboe@kernel.dk>
Wed, 19 Oct 2011 12:30:42 +0000 (14:30 +0200)
commit5c04b426f2e8b46cfc7969a35b2631063a3c646c
tree2d27d9f5d2fe5d5e8fbc01a467ec58bcb50235c1
parent499337bb6511e665a236a6a947f819d98ea340c6
parent899e3ee404961a90b828ad527573aaaac39f0ab1
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>
block/blk-core.c
block/blk-sysfs.c
drivers/block/loop.c
drivers/md/md.c
drivers/md/md.h
drivers/md/multipath.c
drivers/md/raid1.c
drivers/md/raid10.c
drivers/md/raid5.c
include/linux/blkdev.h