Merge branch 'master' of ssh://git.kernel.dk/data/git/fio
authorJens Axboe <axboe@fb.com>
Wed, 23 Apr 2014 15:59:05 +0000 (09:59 -0600)
committerJens Axboe <axboe@fb.com>
Wed, 23 Apr 2014 15:59:05 +0000 (09:59 -0600)

Trivial merge