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)
commitd79db1222039e906dd49ae290daa59701f4e2385
treef9c9379274218218fcdb173b0728480d3c590b68
parentb7d2950ed3ad8537834c6b82d3dbacf33a838f0d
parenteebd2f2d8a022a248acac5685f73665aa0c6ee99
Merge branch 'master' into gfio

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>
24 files changed:
HOWTO
Makefile
backend.c
client.c
engines/libaio.c
eta.c
filesetup.c
fio.1
fio.h
gclient.c
init.c
io_ddir.h
io_u.c
ioengines.c
iolog.h
libfio.c
options.c
os/os-linux.h
parse.c
parse.h
server.h
stat.c
stat.h
thread_options.h