From: Peter Maydell Date: Fri, 21 Nov 2014 14:15:37 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/stefanha/tags/net-pull-request' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=0e88f478508b566152c6681f4889ed9830a2c0a5;p=qemu.git Merge remote-tracking branch 'remotes/stefanha/tags/net-pull-request' into staging # gpg: Signature made Fri 21 Nov 2014 11:12:37 GMT using RSA key ID 81AB73C8 # gpg: Good signature from "Stefan Hajnoczi " # gpg: aka "Stefan Hajnoczi " * remotes/stefanha/tags/net-pull-request: rtl8139: fix Pointer to local outside scope pcnet: fix Negative array index read net/socket: fix Uninitialized scalar variable net/slirp: fix memory leak Signed-off-by: Peter Maydell --- 0e88f478508b566152c6681f4889ed9830a2c0a5