Merge branch 'for-jens' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/linux...
authorJens Axboe <axboe@kernel.dk>
Wed, 22 Jan 2014 04:18:54 +0000 (20:18 -0800)
committerJens Axboe <axboe@kernel.dk>
Wed, 22 Jan 2014 04:18:54 +0000 (20:18 -0800)

Trivial merge