Merge branch 'master' of ssh://brick.kernel.dk/data/git/fio
authorJens Axboe <axboe@kernel.dk>
Tue, 26 Jun 2012 22:20:12 +0000 (18:20 -0400)
committerJens Axboe <axboe@kernel.dk>
Tue, 26 Jun 2012 22:20:12 +0000 (18:20 -0400)

Trivial merge