Merge branch 'master' into gfio
authorJens Axboe <axboe@kernel.dk>
Fri, 5 Apr 2013 10:46:54 +0000 (12:46 +0200)
committerJens Axboe <axboe@kernel.dk>
Fri, 5 Apr 2013 10:46:54 +0000 (12:46 +0200)
commit62232d0618e3f5aa4805b4be34e872895ba1beb2
treebefeb3e1cb34b485283b3368a8bc717a7b3670d0
parentd7213923067aa49922962a469a691c3ec951064d
parent2dc7637600dd1b8936ab173e20110af03d381407
Merge branch 'master' into gfio

Conflicts:
Makefile

Signed-off-by: Jens Axboe <axboe@kernel.dk>
Makefile
backend.c
configure
fio.h
ioengines.c
parse.c
stat.c