Merge branch 'master' into gfio
authorJens Axboe <axboe@kernel.dk>
Wed, 20 Feb 2013 10:52:28 +0000 (11:52 +0100)
committerJens Axboe <axboe@kernel.dk>
Wed, 20 Feb 2013 10:52:28 +0000 (11:52 +0100)
commit6a5c4d92ce70a05d2fee981b6f133373c0ef62f8
treea5075ffaadde9ee493e0a4955c98db187e6faf72
parent9db01ef976006c002b05fa4e4ec589eb029aac5b
parent9e6eedcd3535a249b73db0551f15044360239de5
Merge branch 'master' into gfio

Conflicts:
configure
fio.c
init.c

Signed-off-by: Jens Axboe <axboe@kernel.dk>
Makefile
backend.c
configure
init.c
iolog.c