Merge branch 'master' into gfio
authorJens Axboe <axboe@kernel.dk>
Wed, 10 Apr 2013 09:12:21 +0000 (11:12 +0200)
committerJens Axboe <axboe@kernel.dk>
Wed, 10 Apr 2013 09:12:21 +0000 (11:12 +0200)
commitba9c7219eefcc04e84a4fb4970f4b5caeaf48aa6
tree06b616dd34664b5d43e39002e08a2f1e5671e47f
parentd926d535c7e1a12ff1a57a718ed8e84f617b0172
parent75ee6cf765979f1651d7c01d652cac9dbe79e8b9
Merge branch 'master' into gfio

Conflicts:
options.c
parse.c
server.h

Signed-off-by: Jens Axboe <axboe@kernel.dk>
options.c
parse.c