Merge branch 'master' of ssh://brick.kernel.dk/data/git/fio
authorJens Axboe <axboe@kernel.dk>
Fri, 2 Nov 2012 15:36:16 +0000 (16:36 +0100)
committerJens Axboe <axboe@kernel.dk>
Fri, 2 Nov 2012 15:36:16 +0000 (16:36 +0100)

Trivial merge