Merge branch 'master' of ssh://git.kernel.dk/data/git/fio
authorJens Axboe <axboe@fb.com>
Wed, 24 Sep 2014 14:21:47 +0000 (08:21 -0600)
committerJens Axboe <axboe@fb.com>
Wed, 24 Sep 2014 14:21:47 +0000 (08:21 -0600)

Trivial merge