Merge branch 'master' of ssh://git.kernel.dk/data/git/fio
authorJens Axboe <axboe@fb.com>
Thu, 26 Feb 2015 15:42:31 +0000 (08:42 -0700)
committerJens Axboe <axboe@fb.com>
Thu, 26 Feb 2015 15:42:31 +0000 (08:42 -0700)

Trivial merge