Merge branch 'master' of ssh://router/data/git/fio
authorJens Axboe <jens.axboe@oracle.com>
Wed, 24 Mar 2010 12:24:05 +0000 (13:24 +0100)
committerJens Axboe <jens.axboe@oracle.com>
Wed, 24 Mar 2010 12:24:05 +0000 (13:24 +0100)
1  2 
init.c

diff --cc init.c
Simple merge