Merge branch 'master' of git://github.com/DaveGlen/fio
authorJens Axboe <axboe@fb.com>
Mon, 17 Aug 2015 21:39:23 +0000 (15:39 -0600)
committerJens Axboe <axboe@fb.com>
Mon, 17 Aug 2015 21:39:23 +0000 (15:39 -0600)

Trivial merge