tree 4370849a574bf0c340ae5e771348495d63ff8016
parent d79db1222039e906dd49ae290daa59701f4e2385
parent e12d2800f811cb64d376cfdaed9a1257f3fa9c99
author Jens Axboe <axboe@kernel.dk> 1348471444 +0200
committer Jens Axboe <axboe@kernel.dk> 1348471444 +0200

Merge branch 'master' into gfio

Conflicts:
	backend.c
	fio.h
	io_u.c

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