Merge branch 'for-linus' into for-3.2/core

author Jens Axboe <axboe@kernel.dk>

Mon, 24 Oct 2011 14:24:38 +0000 (16:24 +0200)

committer Jens Axboe <axboe@kernel.dk>

Mon, 24 Oct 2011 14:24:38 +0000 (16:24 +0200)
author Jens Axboe <axboe@kernel.dk>
Mon, 24 Oct 2011 14:24:38 +0000 (16:24 +0200)
committer Jens Axboe <axboe@kernel.dk>
Mon, 24 Oct 2011 14:24:38 +0000 (16:24 +0200)
diff --cc block/blk-core.c
Simple merge
diff --cc drivers/block/loop.c
Simple merge
author	Jens Axboe <axboe@kernel.dk>
	Mon, 24 Oct 2011 14:24:38 +0000 (16:24 +0200)
committer	Jens Axboe <axboe@kernel.dk>
	Mon, 24 Oct 2011 14:24:38 +0000 (16:24 +0200)
		1	2
block/blk-core.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/block/loop.c	patch \|	diff1 \|	diff2 \|	blob \| history