Merge branch 'master' into gfio
authorJens Axboe <axboe@kernel.dk>
Fri, 14 Dec 2012 19:37:21 +0000 (20:37 +0100)
committerJens Axboe <axboe@kernel.dk>
Fri, 14 Dec 2012 19:37:21 +0000 (20:37 +0100)
1  2 
filesetup.c
options.c

diff --cc filesetup.c
Simple merge
diff --cc options.c
Simple merge