Merge branch 'master' into gfio
authorJens Axboe <axboe@kernel.dk>
Mon, 4 Feb 2013 11:51:09 +0000 (12:51 +0100)
committerJens Axboe <axboe@kernel.dk>
Mon, 4 Feb 2013 11:51:09 +0000 (12:51 +0100)
commit90b7a96d9573a14f20470af2aa0dd4e60611a477
treeaed7c16b64663689952d180a4c8d2ff365c45baf
parentb7a99316269656cfdcbd4d13983cee684ae00f6b
parent7189c969816dbea1c4c73209e61332b75cf882c7
Merge branch 'master' into gfio

Conflicts:
Makefile
fio.h
parse.c

Signed-off-by: Jens Axboe <axboe@kernel.dk>
14 files changed:
HOWTO
Makefile
backend.c
cconv.c
configure
eta.c
fio.1
fio.h
init.c
options.c
os/os.h
parse.c
stat.c
thread_options.h