Merge branch 'master' of https://github.com/dublio/fio
authorJens Axboe <axboe@kernel.dk>
Mon, 31 Jul 2017 14:15:17 +0000 (08:15 -0600)
committerJens Axboe <axboe@kernel.dk>
Mon, 31 Jul 2017 14:15:17 +0000 (08:15 -0600)

Trivial merge