projects / fio.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3baddf2 2b386d2)
Merge branch 'master' of ssh://git.kernel.dk/data/git/fio
authorJens Axboe <jens.axboe@oracle.com>
Fri, 4 Apr 2008 11:47:20 +0000 (13:47 +0200)
committerJens Axboe <jens.axboe@oracle.com>
Fri, 4 Apr 2008 11:47:20 +0000 (13:47 +0200)
1  2 
filesetup.c patch | diff1 | diff2 | blob | history

diff --cc filesetup.c
Simple merge
fio - Flexible IO Tester