Merge branch 'master' of git://github.com/rootfs/fio
authorJens Axboe <axboe@fb.com>
Mon, 19 May 2014 15:49:56 +0000 (09:49 -0600)
committerJens Axboe <axboe@fb.com>
Mon, 19 May 2014 15:49:56 +0000 (09:49 -0600)
commit25f488581e510c1b440f2e76842ec23f3dad7b57
treec9c3bc7466d73836ad49735b782fed9dfe6ef1d6
parent086f99352cf8945515197997496c4822e6d51bf8
parent6fa14b995d65be5d4fd423664f4d339568c3c846
Merge branch 'master' of git://github.com/rootfs/fio

Signed-off-by: Jens Axboe <axboe@fb.com>
Conflicts:
configure
Makefile
configure
fio.1
options.c