Merge branch 'master' into gfio

Conflicts:
	Makefile
	fio.h
	parse.c

Signed-off-by: Jens Axboe <axboe@kernel.dk>