Merge branch 'master' into gfio
authorJens Axboe <axboe@kernel.dk>
Wed, 9 Jan 2013 13:10:36 +0000 (14:10 +0100)
committerJens Axboe <axboe@kernel.dk>
Wed, 9 Jan 2013 13:10:36 +0000 (14:10 +0100)
commit92a0daf8163eaa8d117d1e6e4fdc11a8dddac2d2
tree3f8790f54d811da34b9fa9ac153d8aeddd4dd3f9
parent42634d2118b41f26151f5b708e83d40061570653
parent78c1111eacdb594e0488d5adc508091fc2a3af88
Merge branch 'master' into gfio

Conflicts:
client.c
server.h

Signed-off-by: Jens Axboe <axboe@kernel.dk>
HOWTO
Makefile
backend.c
engines/libaio.c
filesetup.c
fio.1
init.c
server.h
stat.h