Merge branch 'gfio' of ssh://brick.kernel.dk/data/git/fio into gfio
authorJens Axboe <axboe@kernel.dk>
Thu, 27 Sep 2012 17:28:25 +0000 (19:28 +0200)
committerJens Axboe <axboe@kernel.dk>
Thu, 27 Sep 2012 17:28:25 +0000 (19:28 +0200)

Trivial merge