Merge branch 'master' of ssh://git.kernel.dk/data/git/fio
authorJens Axboe <axboe@fb.com>
Thu, 30 Oct 2014 23:16:32 +0000 (17:16 -0600)
committerJens Axboe <axboe@fb.com>
Thu, 30 Oct 2014 23:16:32 +0000 (17:16 -0600)

Trivial merge