Merge branch 'master' of ssh://git.kernel.dk/data/git/fio
authorJens Axboe <axboe@fb.com>
Wed, 8 Apr 2015 17:10:59 +0000 (11:10 -0600)
committerJens Axboe <axboe@fb.com>
Wed, 8 Apr 2015 17:10:59 +0000 (11:10 -0600)

Trivial merge