Merge branch 'for-linus' into for-3.2/core
authorJens Axboe <axboe@kernel.dk>
Mon, 24 Oct 2011 14:24:38 +0000 (16:24 +0200)
committerJens Axboe <axboe@kernel.dk>
Mon, 24 Oct 2011 14:24:38 +0000 (16:24 +0200)
commit83157223defe3be490cfea048e83451b6f254216
treefa484185d27765a13036bb43ae68d8cdb63f585b
parent9562ad9ab36df7ccef920d119f3b5100025db95f
parentf992ae801a7dec34a4ed99a6598bbbbfb82af4fb
Merge branch 'for-linus' into for-3.2/core
block/blk-core.c
drivers/block/loop.c