Merge branch 'master' of git://hg.uk.xensource.com/carbon/trunk-ring3/blktap
Merge commit 'a5fdb9a2301936339259ffe7649aa6af4339c4b9'
Remove unused driver (block-export)
Coding style cleanup for NBD code to match the rest of blktap code.

Linux coding style is used for this repository.
Fix a couple of memory leaks
Clean up fdreceiver sockets on exit
Merge commit 'e4af93420ebfb0569a416f07d02b7c9bfeb8190d'
Merge commit '4a556d4599956c885c921fd8648149dbda3e43d2'
Merge pull request #8 from andreil/trunk-ring3

Cleanup & fixes after code-reviewing the NBD additions
Merge commit 'a53f25c119f0b7641460e52ca9dc90f75facd33f'
correctly set return code
Merge branch 'master' of git://hg.uk.xensource.com/carbon/trunk/blktap
Merge commit 'e43e8a6d73c93d9c041800d6e05467a3d6b6ce5d'
fixed passing bdev read only flag to blktap2 kernel module
Merge pull request #12 from tmakatos/master

print error message instead of error number
CA-84670: fix segfault because of uninitialized conn->info
Merge pull request #17 from tmakatos/CA-84670

CA-84670: fix segfault because of uninitialized conn->info
Merge remote branch 'remotes/origin/trunk-ring3'
Merge branch 'trunk'
CA-88376: Reset the nbd_mirror_failed flag when disabling mirroring

Signed-off-by: Jon Ludlam <jonathan.ludlam@eu.citrix.com>