Merge branch 'stable/for-jens-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorJens Axboe <axboe@kernel.dk>
Mon, 12 Nov 2012 16:18:47 +0000 (09:18 -0700)
committerJens Axboe <axboe@kernel.dk>
Mon, 12 Nov 2012 16:18:47 +0000 (09:18 -0700)

Trivial merge