Merge branch 'master' into gfio
authorJens Axboe <axboe@kernel.dk>
Mon, 3 Dec 2012 13:37:23 +0000 (14:37 +0100)
committerJens Axboe <axboe@kernel.dk>
Mon, 3 Dec 2012 13:37:23 +0000 (14:37 +0100)
commit49758e11f3658686ccd1c61724a5eba142f3ee4f
treecc63995cb48b85873f7798230fa856988cdaaeb1
parent7956f141c058cdd95f14491ee646b7f7951ab2ab
parenta7f5831f1feafbaa41a558028226b517734c54a0
Merge branch 'master' into gfio

Conflicts:
Makefile
fio.h
io_u.c
ioengine.h
memory.c

Signed-off-by: Jens Axboe <axboe@kernel.dk>
21 files changed:
HOWTO
Makefile
backend.c
cconv.c
engines/net.c
filesetup.c
fio.1
fio.h
init.c
io_ddir.h
io_u.c
ioengine.h
libfio.c
memory.c
options.c
os/os-linux.h
os/os.h
parse.c
profile.c
thread_options.h
verify.c