Merge branch 'master' into gfio
authorJens Axboe <axboe@kernel.dk>
Tue, 11 Dec 2012 07:11:11 +0000 (08:11 +0100)
committerJens Axboe <axboe@kernel.dk>
Tue, 11 Dec 2012 07:11:11 +0000 (08:11 +0100)
commit2a988d8bcb447eb098fc382835cc507587c6ba66
tree2b8c56f30eb73746282197a8f9faa18dc06f53d8
parent481075983e3c71460b9f784ddfb14099857e444a
parentd06ab917303f70289ad8f256c6e79a1eeee4bee4
Merge branch 'master' into gfio

Conflicts:
fio.c

Signed-off-by: Jens Axboe <axboe@kernel.dk>
HOWTO
backend.c
filesetup.c
fio.1
fio.c
fio.h
init.c
ioengine.h
options.c
parse.c