Skip to content
Commit 5c04b426 authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge branch 'v3.1-rc10' into for-3.2/core



Conflicts:
	block/blk-core.c
	include/linux/blkdev.h

Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parents 499337bb 899e3ee4
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment