Merge branch 'for-jens' of http://evilpiepirate.org/git/linux-bcache into for-3.10...

author Jens Axboe <axboe@kernel.dk>

Mon, 25 Mar 2013 03:38:59 +0000 (21:38 -0600)

committer Jens Axboe <axboe@kernel.dk>

Mon, 25 Mar 2013 03:38:59 +0000 (21:38 -0600)
author Jens Axboe <axboe@kernel.dk>
Mon, 25 Mar 2013 03:38:59 +0000 (21:38 -0600)
committer Jens Axboe <axboe@kernel.dk>
Mon, 25 Mar 2013 03:38:59 +0000 (21:38 -0600)
diff --cc block/blk-core.c
Simple merge
diff --cc include/linux/blk_types.h
Simple merge
author	Jens Axboe <axboe@kernel.dk>
	Mon, 25 Mar 2013 03:38:59 +0000 (21:38 -0600)
committer	Jens Axboe <axboe@kernel.dk>
	Mon, 25 Mar 2013 03:38:59 +0000 (21:38 -0600)
		1	2
block/blk-core.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/blk_types.h	patch \|	diff1 \|	diff2 \|	blob \| history