Merge branch 'master' of github.com:axboe/fio into fixtype
authorSam Zaydel <szaydel@gmail.com>
Tue, 9 Jun 2015 21:11:36 +0000 (14:11 -0700)
committerSam Zaydel <szaydel@gmail.com>
Tue, 9 Jun 2015 21:11:36 +0000 (14:11 -0700)

Trivial merge