From: Jens Axboe <axboe@kernel.dk>
Date: Mon, 4 Feb 2013 11:51:09 +0000 (+0100)
Subject: Merge branch 'master' into gfio
X-Git-Tag: fio-2.1~57^2~24
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=90b7a96d9573a14f20470af2aa0dd4e60611a477;hp=90b7a96d9573a14f20470af2aa0dd4e60611a477

Merge branch 'master' into gfio

Conflicts:
	Makefile
	fio.h
	parse.c

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