Merge branch 'master' of https://github.com/jan--f/fio
authorJens Axboe <axboe@fb.com>
Thu, 15 Sep 2016 13:57:38 +0000 (07:57 -0600)
committerJens Axboe <axboe@fb.com>
Thu, 15 Sep 2016 13:57:38 +0000 (07:57 -0600)

Trivial merge