From: Jens Axboe <axboe@kernel.dk>
Date: Thu, 15 Nov 2012 20:57:29 +0000 (-0700)
Subject: Merge branch 'master' into gfio
X-Git-Tag: fio-2.1~57^2~41
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=7956f141c058cdd95f14491ee646b7f7951ab2ab

Merge branch 'master' into gfio

Conflicts:
	libfio.c
	server.c

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

7956f141c058cdd95f14491ee646b7f7951ab2ab