Merge branch 'master' into gfio
authorJens Axboe <axboe@kernel.dk>
Tue, 29 Jan 2013 09:09:55 +0000 (10:09 +0100)
committerJens Axboe <axboe@kernel.dk>
Tue, 29 Jan 2013 09:09:55 +0000 (10:09 +0100)
commit135be493d843d4cae2966a35cbd22a3058ec8e4b
treee0723f87368718bbbd4d1e53e7d5657a050b6f1a
parent47f4463579ab92332ef995774d8578b0191da6e4
parent899fab33f71cd9fd7037ee4c0df707daa86a0bbd
Merge branch 'master' into gfio

Conflicts:
Makefile
configure
options.c

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