Merge branch 'master' into gfio
authorJens Axboe <axboe@kernel.dk>
Fri, 16 Mar 2012 13:02:54 +0000 (14:02 +0100)
committerJens Axboe <axboe@kernel.dk>
Fri, 16 Mar 2012 13:02:54 +0000 (14:02 +0100)
commit6a4cf74fc2521b601cb1cc9478526cc441830a5c
tree86268a2f06c2e90123bf8f57be0d4772e161221e
parent49c34176d4130b3d4c4d90397a497b335f7ddbac
parent8a74b56d7aef44ea75d7abf910ad75378b438fe3
Merge branch 'master' into gfio

Conflicts:
fio.h

Signed-off-by: Jens Axboe <axboe@kernel.dk>
backend.c
cconv.c
options.c
thread_options.h