Merge branch 'master' into gfio
authorJens Axboe <axboe@kernel.dk>
Thu, 21 Mar 2013 12:45:27 +0000 (06:45 -0600)
committerJens Axboe <axboe@kernel.dk>
Thu, 21 Mar 2013 12:45:27 +0000 (06:45 -0600)
commitd7213923067aa49922962a469a691c3ec951064d
tree8b07e631e1c461e53fc1673f67d4e58c018e7a72
parent8ea39c32d29428b17bfe9c806fc33f0c8adfe118
parent28b9b51a346dede84c8baee6ed96a328e97d1796
Merge branch 'master' into gfio

Conflicts:
Makefile
fio.h
options.c

Signed-off-by: Jens Axboe <axboe@kernel.dk>
13 files changed:
HOWTO
Makefile
backend.c
cconv.c
configure
filesetup.c
fio.1
fio.h
init.c
libfio.c
memory.c
options.c
thread_options.h