Merge branch 'gfio' of ssh://brick.kernel.dk/data/git/fio into gfio
authorJens Axboe <axboe@kernel.dk>
Tue, 20 Mar 2012 07:11:47 +0000 (08:11 +0100)
committerJens Axboe <axboe@kernel.dk>
Tue, 20 Mar 2012 07:11:47 +0000 (08:11 +0100)
1  2 
init.c

diff --cc init.c
Simple merge