Merge branch 'master' into gfio
authorJens Axboe <axboe@kernel.dk>
Wed, 29 Feb 2012 09:15:51 +0000 (10:15 +0100)
committerJens Axboe <axboe@kernel.dk>
Wed, 29 Feb 2012 09:15:51 +0000 (10:15 +0100)
We need the crc function namespace change.

1  2 
server.c

diff --cc server.c
Simple merge