Merge branch 'master' of router:/data/git/fio
authorJens Axboe <axboe@ml370.home.kernel.dk>
Tue, 30 May 2006 12:29:37 +0000 (14:29 +0200)
committerJens Axboe <axboe@ml370.home.kernel.dk>
Tue, 30 May 2006 12:29:37 +0000 (14:29 +0200)
1  2 
fio-ini.c

diff --cc fio-ini.c
Simple merge