Merge branch 'master' into gfio
authorJens Axboe <axboe@kernel.dk>
Tue, 13 Mar 2012 13:01:11 +0000 (14:01 +0100)
committerJens Axboe <axboe@kernel.dk>
Tue, 13 Mar 2012 13:01:11 +0000 (14:01 +0100)
commite476994eed3bee246ca166ea6ad6018911408e9b
treec3cde7e8fda2f3ce7d9d074c91d9ecc77d3f06a1
parent38634cb19ddc5576b6e96a30fd6c444082e93501
parentba47f51ac3ab61b424e2d2406762d838ddb78b10
Merge branch 'master' into gfio

Conflicts:
client.c
fio.h

Signed-off-by: Jens Axboe <axboe@kernel.dk>
cconv.c
client.c
init.c
ioengine.h
options.c
server.c
thread_options.h