Merge branch 'master' into gfio
authorJens Axboe <axboe@kernel.dk>
Wed, 1 Aug 2012 07:50:27 +0000 (09:50 +0200)
committerJens Axboe <axboe@kernel.dk>
Wed, 1 Aug 2012 07:50:27 +0000 (09:50 +0200)
commit80666bece308842c36132245e4cbbe9eb0bc506b
treea5b9c34c7c3d0d06fe5e6244fdd4c467d4ced93a
parentc41a9d06a1957ba7c5a019e3d6088a5e8e8e0a47
parentfeb418556a236aa041a625b083d6b99e55d23d74
Merge branch 'master' into gfio

Conflicts:
iolog.h
stat.c

Signed-off-by: Jens Axboe <axboe@kernel.dk>
Makefile
backend.c
filesetup.c
iolog.h
stat.c