Merge branch 'master' into gfio
authorJens Axboe <axboe@kernel.dk>
Thu, 31 Jan 2013 12:23:40 +0000 (13:23 +0100)
committerJens Axboe <axboe@kernel.dk>
Thu, 31 Jan 2013 12:23:40 +0000 (13:23 +0100)
commit95820b6e6c92025df8d89c0bf39b174e53137c41
tree453d2323341dc55ef93eecee6ef32a6bf5fcf5ea
parent135be493d843d4cae2966a35cbd22a3058ec8e4b
parent1eafa37ac57bb08ca21af8ab76bd7848ae2e7c97
Merge branch 'master' into gfio

Conflicts:
Makefile
client.c
configure
fio.c
fio.h
server.c
server.h

Signed-off-by: Jens Axboe <axboe@kernel.dk>
23 files changed:
HOWTO
Makefile
backend.c
cconv.c
client.c
configure
engines/net.c
eta.c
filesetup.c
fio.1
fio.c
fio.h
init.c
iolog.c
log.c
options.c
os/os-linux.h
server.c
server.h
stat.c
stat.h
thread_options.h
verify.c