Merge branch 'stable/for-jens-3.13-take-two' of git://git.kernel.org/pub/scm/linux...
authorJens Axboe <axboe@kernel.dk>
Thu, 28 Nov 2013 02:12:58 +0000 (19:12 -0700)
committerJens Axboe <axboe@kernel.dk>
Thu, 28 Nov 2013 02:12:58 +0000 (19:12 -0700)

Trivial merge