Merge branch 'master' into gfio
authorJens Axboe <axboe@kernel.dk>
Thu, 24 Jan 2013 16:08:45 +0000 (09:08 -0700)
committerJens Axboe <axboe@kernel.dk>
Thu, 24 Jan 2013 16:08:45 +0000 (09:08 -0700)
commit836fcc0fceb233ebcc41ee63b4ea5cae20b678a4
treeba33bc3088166274d603105a9e957fda8fa7c013
parent4aaefbfa2b7a7a70ff6c6851dc3cee01b5993149
parent798827c895a585f284842f6b99378be19c821263
Merge branch 'master' into gfio

Conflicts:
Makefile
backend.c
client.c
fio.c
fio.h
ioengine.h
options.c
os/os-linux.h
server.c

Signed-off-by: Jens Axboe <axboe@kernel.dk>
24 files changed:
HOWTO
Makefile
backend.c
cconv.c
client.c
engines/libaio.c
engines/net.c
eta.c
filesetup.c
fio.1
fio.c
fio.h
init.c
ioengine.h
ioengines.c
iolog.h
libfio.c
memory.c
options.c
os/os-linux.h
os/os.h
server.c
thread_options.h
verify.c