Merge branch 'master' of ssh://git.kernel.dk/data/git/fio
authorJens Axboe <axboe@fb.com>
Mon, 15 Dec 2014 02:03:12 +0000 (19:03 -0700)
committerJens Axboe <axboe@fb.com>
Mon, 15 Dec 2014 02:03:12 +0000 (19:03 -0700)

Trivial merge