OSDN Git Service

Merge remote-tracking branch 'remotes/stefanha/tags/net-pull-request' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Sat, 20 Dec 2014 22:04:13 +0000 (22:04 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Sat, 20 Dec 2014 22:04:13 +0000 (22:04 +0000)
# 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>

Trivial merge