Merge branch 'master' into client-server
authorJens Axboe <axboe@kernel.dk>
Wed, 5 Oct 2011 07:55:28 +0000 (09:55 +0200)
committerJens Axboe <axboe@kernel.dk>
Wed, 5 Oct 2011 07:55:28 +0000 (09:55 +0200)
commitd5e3a0c6f5376e0d76143edb2c1622efd77f995f
tree98e92a24a8ed58e8f56a8d900050cd6f12ad2190
parent802ad4a83e92a30b5fdccf117d59fbb69068c054
parent8c029376bbe6d8a6bcb01c3ef7d545720aca3868
Merge branch 'master' into client-server

Conflicts:
init.c

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