Merge branch 'master' of ssh://git.kernel.dk/data/git/fio
authorJens Axboe <axboe@fb.com>
Tue, 8 Apr 2014 19:44:37 +0000 (13:44 -0600)
committerJens Axboe <axboe@fb.com>
Tue, 8 Apr 2014 19:44:37 +0000 (13:44 -0600)

Trivial merge