Merge branch 'master' of ssh://brick.kernel.dk/data/git/fio
authorJens Axboe <jaxboe@fusionio.com>
Tue, 30 Nov 2010 19:49:24 +0000 (20:49 +0100)
committerJens Axboe <jaxboe@fusionio.com>
Tue, 30 Nov 2010 19:49:24 +0000 (20:49 +0100)

Trivial merge