From: Peter Maydell Date: Wed, 12 Mar 2014 16:45:25 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/stefanha/tags/net-pull-request' into staging X-Git-Tag: qemu-xen-4.5.0-rc1~121 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=2f23e9ae2cc37788ae1211803a7f8545ae14df91;p=qemu-xen.git Merge remote-tracking branch 'remotes/stefanha/tags/net-pull-request' into staging Net patches # gpg: Signature made Wed 12 Mar 2014 13:48:20 GMT using RSA key ID 81AB73C8 # gpg: Good signature from "Stefan Hajnoczi " # gpg: aka "Stefan Hajnoczi " # gpg: WARNING: This key is not certified with a trusted signature! # gpg: There is no indication that the signature belongs to the owner. # Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35 775A 9CA4 ABB3 81AB 73C8 * remotes/stefanha/tags/net-pull-request: tap: avoid deadlocking rx Signed-off-by: Peter Maydell --- 2f23e9ae2cc37788ae1211803a7f8545ae14df91