From: Peter Maydell <peter.maydell@linaro.org>
Date: Sat, 20 Dec 2014 22:04:13 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/stefanha/tags/net-pull-request' into staging
X-Git-Tag: v2.3.0-rc0~127
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=328b3b6c44c17d94df115ed1851f54a0bd59a471;p=thirdparty%2Fqemu.git

Merge remote-tracking branch 'remotes/stefanha/tags/net-pull-request' into staging

# gpg: Signature made Fri 19 Dec 2014 13:18:18 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:
  e1000: defer packets until BM enabled
  net: Use g_new() & friends where that makes obvious sense
  net: Fuse g_malloc(); memset() into g_new0()
  net: don't use set/get_pointer() in set/get_netdev()
  tap: fix vcpu long time io blocking on tap

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

328b3b6c44c17d94df115ed1851f54a0bd59a471