Merge branch 'master' of https://github.com/Venutiwa/fio
authorJens Axboe <axboe@kernel.dk>
Thu, 12 Oct 2017 16:31:17 +0000 (10:31 -0600)
committerJens Axboe <axboe@kernel.dk>
Thu, 12 Oct 2017 16:31:17 +0000 (10:31 -0600)

Trivial merge