Merge branch 'master' of ssh://git.kernel.dk/data/git/fio
authorJens Axboe <axboe@kernel.dk>
Tue, 8 Oct 2013 14:49:25 +0000 (08:49 -0600)
committerJens Axboe <axboe@kernel.dk>
Tue, 8 Oct 2013 14:49:25 +0000 (08:49 -0600)

Trivial merge