Merge branch 'master' of ssh://router/data/git/fio
authorJens Axboe <axboe@nelson.home.kernel.dk>
Wed, 31 May 2006 08:16:18 +0000 (10:16 +0200)
committerJens Axboe <axboe@nelson.home.kernel.dk>
Wed, 31 May 2006 08:16:18 +0000 (10:16 +0200)
1  2 
fio-ini.c

diff --cc fio-ini.c
Simple merge