Merge remote-tracking branch 'remotes/stefanha/tags/net-pull-request' into staging master
authorPeter Maydell <peter.maydell@linaro.org>
Fri, 21 Nov 2014 14:15:37 +0000 (14:15 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Fri, 21 Nov 2014 14:15:37 +0000 (14:15 +0000)
commit0e88f478508b566152c6681f4889ed9830a2c0a5
tree0e6684291da7821000a2bd3e78e56b55af322242
parenta00c1173385741007f71ce505d092f4cc174f449
parentb0af844007841609cc11fab58f838bd105cbe144
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 <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"

* 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 <peter.maydell@linaro.org>