Merge branch 'master' into gfio
authorJens Axboe <axboe@kernel.dk>
Thu, 5 Apr 2012 14:58:31 +0000 (08:58 -0600)
committerJens Axboe <axboe@kernel.dk>
Thu, 5 Apr 2012 14:58:31 +0000 (08:58 -0600)
Conflicts:
fio.c
fio.h

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

No differences found