Merge branch 'master' of https://github.com/cbwest3/fio

author Jens Axboe <axboe@fb.com>

Mon, 5 Jun 2017 15:36:23 +0000 (09:36 -0600)

committer Jens Axboe <axboe@fb.com>

Mon, 5 Jun 2017 15:36:23 +0000 (09:36 -0600)
author Jens Axboe <axboe@fb.com>
Mon, 5 Jun 2017 15:36:23 +0000 (09:36 -0600)
committer Jens Axboe <axboe@fb.com>
Mon, 5 Jun 2017 15:36:23 +0000 (09:36 -0600)
diff --cc HOWTO
Simple merge
diff --cc filesetup.c
Simple merge
diff --cc fio.1
Simple merge
author	Jens Axboe <axboe@fb.com>
	Mon, 5 Jun 2017 15:36:23 +0000 (09:36 -0600)
committer	Jens Axboe <axboe@fb.com>
	Mon, 5 Jun 2017 15:36:23 +0000 (09:36 -0600)
		1	2
HOWTO	patch \|	diff1 \|	diff2 \|	blob \| history
filesetup.c	patch \|	diff1 \|	diff2 \|	blob \| history
fio.1	patch \|	diff1 \|	diff2 \|	blob \| history