Merge branch 'master' into gfio
authorJens Axboe <axboe@kernel.dk>
Mon, 24 Sep 2012 06:51:24 +0000 (08:51 +0200)
committerJens Axboe <axboe@kernel.dk>
Mon, 24 Sep 2012 06:51:24 +0000 (08:51 +0200)
Conflicts:
Makefile
backend.c
client.c
fio.h
init.c
io_ddir.h
options.c
server.h
stat.c
stat.h

Signed-off-by: Jens Axboe <axboe@kernel.dk>

No differences found