tree f9c9379274218218fcdb173b0728480d3c590b68
parent b7d2950ed3ad8537834c6b82d3dbacf33a838f0d
parent eebd2f2d8a022a248acac5685f73665aa0c6ee99
author Jens Axboe <axboe@kernel.dk> 1348469484 +0200
committer Jens Axboe <axboe@kernel.dk> 1348469484 +0200

Merge branch 'master' into gfio

Conflicts:
	Makefile
	backend.c
	client.c
	fio.h
	init.c
	io_ddir.h
	options.c
	server.h
	stat.c
	stat.h

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