Merge branch 'master' of ssh://router/data/git/fio
authorJens Axboe <jens.axboe@oracle.com>
Tue, 9 Jun 2009 10:48:56 +0000 (12:48 +0200)
committerJens Axboe <jens.axboe@oracle.com>
Tue, 9 Jun 2009 10:48:56 +0000 (12:48 +0200)
1  2 
fio.h
init.c

diff --cc fio.h
Simple merge
diff --cc init.c
Simple merge