From: Jens Axboe <axboe@kernel.dk>
Date: Wed, 12 Oct 2011 07:47:25 +0000 (+0200)
Subject: Merge branch 'master' into client-server
X-Git-Tag: fio-1.99.5~6
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=fddc6604f91ebf76d9090741f9d4f5a4d33be0c6;p=fio.git

Merge branch 'master' into client-server

Conflicts:
	init.c
	io_u.c
	os/windows/install.wxs
	os/windows/version.h

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

fddc6604f91ebf76d9090741f9d4f5a4d33be0c6