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)

Trivial merge