Merge branch 'master' into gfio
authorJens Axboe <axboe@kernel.dk>
Tue, 21 Aug 2012 13:34:13 +0000 (15:34 +0200)
committerJens Axboe <axboe@kernel.dk>
Tue, 21 Aug 2012 13:34:13 +0000 (15:34 +0200)
commitc2e9cc4d20c1db1c81276fdaadb56b8b0085d0d8
treebaba19a29839a969927f197812014593b2fcd290
parent80666bece308842c36132245e4cbbe9eb0bc506b
parent242c38db2cabd0f00bbe37a053c62da07ba345a4
Merge branch 'master' into gfio

Conflicts:
eta.c

Signed-off-by: Jens Axboe <axboe@kernel.dk>
Makefile
backend.c
eta.c
filesetup.c
init.c
io_u.c