Merge branch 'master' of ssh://router/data/git/fio

author Jens Axboe <jaxboe@fusionio.com>

Mon, 10 Jan 2011 19:21:02 +0000 (20:21 +0100)

committer Jens Axboe <jaxboe@fusionio.com>

Mon, 10 Jan 2011 19:21:02 +0000 (20:21 +0100)
author Jens Axboe <jaxboe@fusionio.com>
Mon, 10 Jan 2011 19:21:02 +0000 (20:21 +0100)
committer Jens Axboe <jaxboe@fusionio.com>
Mon, 10 Jan 2011 19:21:02 +0000 (20:21 +0100)
diff --cc HOWTO
Simple merge
diff --cc README
Simple merge
diff --cc fio.1
Simple merge
diff --cc fio.c
Simple merge
author	Jens Axboe <jaxboe@fusionio.com>
	Mon, 10 Jan 2011 19:21:02 +0000 (20:21 +0100)
committer	Jens Axboe <jaxboe@fusionio.com>
	Mon, 10 Jan 2011 19:21:02 +0000 (20:21 +0100)
		1	2
HOWTO	patch \|	diff1 \|	diff2 \|	blob \| history
README	patch \|	diff1 \|	diff2 \|	blob \| history
fio.1	patch \|	diff1 \|	diff2 \|	blob \| history
fio.c	patch \|	diff1 \|	diff2 \|	blob \| history