Merge branch 'gfio' into gfio-int
authorJens Axboe <axboe@kernel.dk>
Thu, 11 Apr 2013 10:31:29 +0000 (12:31 +0200)
committerJens Axboe <axboe@kernel.dk>
Thu, 11 Apr 2013 10:31:29 +0000 (12:31 +0200)
commit8f91cc3f7835cdca84944d456e1da77d44a7c354
tree4fc022452d94e8e5a6b0af1aa454c5475fd1e0e3
parent0a428b23d4201c31bde25775ecb5f72801f431d9
parent8dc6ebac4b1b406969fb5698505f0c88a1b7d80b
Merge branch 'gfio' into gfio-int

Conflicts:
backend.c
fio.c
fio.h
init.c
libfio.c
options.c
thread_options.h

Signed-off-by: Jens Axboe <axboe@kernel.dk>
backend.c
fio.h
thread_options.h