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

projects / fio.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: d17fda7 b7f05eb)

author	Jens Axboe <axboe@kernel.dk>
	Fri, 11 May 2012 18:38:59 +0000 (20:38 +0200)
committer	Jens Axboe <axboe@kernel.dk>
	Fri, 11 May 2012 18:38:59 +0000 (20:38 +0200)
commit	c41a9d06a1957ba7c5a019e3d6088a5e8e8e0a47
tree	8a26b3977be9053ab4b806b055e2aeb6753c5126	tree \| snapshot
parent	d17fda710e5271eaa6e54dbbf70c5a4a1cf4d769	commit \| diff
parent	b7f05eb03c84bdc1259d1bb1c348328b16164430	commit \| diff

Merge branch 'master' into gfio

Conflicts:
client.c
eta.c
server.c
server.h

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

client.c	diff1 \|	diff2 \|	blob \| history
eta.c	diff1 \|	diff2 \|	blob \| history
fio.1	diff1 \|	diff2 \|	blob \| history
server.c	diff1 \|	diff2 \|	blob \| history
server.h	diff1 \|	diff2 \|	blob \| history
stat.h	diff1 \|	diff2 \|	blob \| history

fio - Flexible IO Tester