Merge branch 'master' into gfio
authorJens Axboe <axboe@kernel.dk>
Wed, 10 Apr 2013 17:50:32 +0000 (19:50 +0200)
committerJens Axboe <axboe@kernel.dk>
Wed, 10 Apr 2013 17:50:32 +0000 (19:50 +0200)
commitb7f487cf80a8299a656df9c2214ff73e72956d71
tree37f596c0795f6c6103ce0e491bdcc70089c69faf
parent2639f0560282832563b787a8b180c68739ec2d04
parent0ed766f6299b2a2edf7dce4b1bf8ecb95963ae7b
Merge branch 'master' into gfio

Conflicts:
engines/libaio.c
engines/net.c
iolog.h
options.c
options.h
parse.c
parse.h
thread_options.h

Signed-off-by: Jens Axboe <axboe@kernel.dk>
HOWTO
engines/libaio.c
engines/net.c
fio.1
iolog.h
options.c
options.h
parse.c
thread_options.h