git.kernel.dk Git - fio.git/commit - thread_options.h

projects / fio.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: d79db12 e12d280)

author	Jens Axboe <axboe@kernel.dk>
	Mon, 24 Sep 2012 07:24:04 +0000 (09:24 +0200)
committer	Jens Axboe <axboe@kernel.dk>
	Mon, 24 Sep 2012 07:24:04 +0000 (09:24 +0200)
commit	e65a950ab73d7d91f267ad7f7b084d94e266fcb0
tree	4370849a574bf0c340ae5e771348495d63ff8016	tree \| snapshot
parent	d79db1222039e906dd49ae290daa59701f4e2385	commit \| diff
parent	e12d2800f811cb64d376cfdaed9a1257f3fa9c99	commit \| diff

Merge branch 'master' into gfio

Conflicts:
backend.c
fio.h
io_u.c

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

HOWTO	diff1 \|	diff2 \|	blob \| history
backend.c	diff1 \|	diff2 \|	blob \| history
fio.1	diff1 \|	diff2 \|	blob \| history
fio.h	diff1 \|	diff2 \|	blob \| history
init.c	diff1 \|	diff2 \|	blob \| history
io_u.c	diff1 \|	diff2 \|	blob \| history
options.c	diff1 \|	diff2 \|	blob \| history
thread_options.h	diff1 \|	\|	blob \| history
verify.c	diff1 \|	diff2 \|	blob \| history

fio - Flexible IO Tester