Merge branch 'master' into gfio
authorJens Axboe <axboe@kernel.dk>
Thu, 7 Feb 2013 14:45:39 +0000 (15:45 +0100)
committerJens Axboe <axboe@kernel.dk>
Thu, 7 Feb 2013 14:45:39 +0000 (15:45 +0100)
commit9db01ef976006c002b05fa4e4ec589eb029aac5b
treee565e766752caff4d953674044c1870ab9fbb193
parent90b7a96d9573a14f20470af2aa0dd4e60611a477
parentd6b18e27798a7f4fa345515892d9bd1d9370ea7b
Merge branch 'master' into gfio

Conflicts:
Makefile
configure
fio.h

Signed-off-by: Jens Axboe <axboe@kernel.dk>
Makefile
cconv.c
configure
eta.c
init.c
options.c
parse.c
stat.c
stat.h
thread_options.h