tree 4fc022452d94e8e5a6b0af1aa454c5475fd1e0e3
parent 0a428b23d4201c31bde25775ecb5f72801f431d9
parent 8dc6ebac4b1b406969fb5698505f0c88a1b7d80b
author Jens Axboe <axboe@kernel.dk> 1365676289 +0200
committer Jens Axboe <axboe@kernel.dk> 1365676289 +0200

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>