Merge branch 'master' into gfio
authorJens Axboe <axboe@kernel.dk>
Wed, 14 Nov 2012 21:25:31 +0000 (14:25 -0700)
committerJens Axboe <axboe@kernel.dk>
Wed, 14 Nov 2012 21:25:31 +0000 (14:25 -0700)
commit1e5324e723116a5faf9da686993cc79c14d62d4b
tree3706f8810ba16359cf3f48f9b9c12784f99f7987
parentf681d0bac9c42e5d6bcb3601d2f3cfaa1c2cefb4
parent108fea772db5f1dd91e2fb67737e3e0d36827b76
Merge branch 'master' into gfio

Conflicts:
Makefile
backend.c
client.c
fio.h
options.c
parse.c
parse.h
server.c
server.h

Signed-off-by: Jens Axboe <axboe@kernel.dk>
21 files changed:
HOWTO
Makefile
backend.c
cconv.c
client.c
client.h
eta.c
filesetup.c
fio.1
fio.h
init.c
io_u.c
lib/rbtree.c
lib/rbtree.h
options.c
parse.c
parse.h
server.c
server.h
stat.c
thread_options.h