Merge branch 'master' of git://github.com/ezrapedersen/fio
authorJens Axboe <axboe@fb.com>
Thu, 7 Jan 2016 22:01:09 +0000 (15:01 -0700)
committerJens Axboe <axboe@fb.com>
Thu, 7 Jan 2016 22:01:09 +0000 (15:01 -0700)

Trivial merge