Merge branch 'master' of ssh://git.kernel.dk/data/git/fio
authorJens Axboe <axboe@fb.com>
Fri, 8 May 2015 15:21:17 +0000 (09:21 -0600)
committerJens Axboe <axboe@fb.com>
Fri, 8 May 2015 15:21:17 +0000 (09:21 -0600)

Trivial merge