Merge branch 'stable/for-jens-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorJens Axboe <axboe@kernel.dk>
Sun, 25 Dec 2011 15:46:46 +0000 (16:46 +0100)
committerJens Axboe <axboe@kernel.dk>
Sun, 25 Dec 2011 15:46:46 +0000 (16:46 +0100)

Trivial merge