Merge branch 'master' of ssh://router/data/git/fio
authorJens Axboe <axboe@suse.de>
Fri, 2 Jun 2006 08:53:49 +0000 (10:53 +0200)
committerJens Axboe <axboe@suse.de>
Fri, 2 Jun 2006 08:53:49 +0000 (10:53 +0200)
commita12fc0225482bd1580a332312f2a60f73a9ebc28
tree85abc54733889a2cedcf8dbecbe18511b4de14ab
parentb6f4d8804ad499adf10b4cad0657284a8a4a6287
parent843a741389226f5f2d0ce8636cd57532be9b7e4d
Merge branch 'master' of ssh://router/data/git/fio

Conflicts:

fio.h
README
fio-ini.c
fio.c
fio.h