Merge branch 'req6' of git://github.com/kusumi/fio
authorJens Axboe <axboe@fb.com>
Mon, 1 Jun 2015 14:32:45 +0000 (08:32 -0600)
committerJens Axboe <axboe@fb.com>
Mon, 1 Jun 2015 14:32:45 +0000 (08:32 -0600)

Trivial merge