Merge branch 'asmfix' of https://github.com/oohal/fio
authorJens Axboe <axboe@kernel.dk>
Tue, 29 Aug 2017 21:35:49 +0000 (15:35 -0600)
committerJens Axboe <axboe@kernel.dk>
Tue, 29 Aug 2017 21:35:49 +0000 (15:35 -0600)

Trivial merge