Merge branch 'master' of ssh://router/data/git/fio
authorJens Axboe <jens.axboe@oracle.com>
Thu, 2 Jul 2009 06:31:30 +0000 (08:31 +0200)
committerJens Axboe <jens.axboe@oracle.com>
Thu, 2 Jul 2009 06:31:30 +0000 (08:31 +0200)
1  2 
fio.c

diff --cc fio.c
Simple merge