From: Peter Maydell <peter.maydell@linaro.org>
Date: Fri, 6 Feb 2015 14:35:52 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/stefanha/tags/net-pull-request' into staging
X-Git-Tag: qemu-xen-4.7.0-rc1~468
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=cebbae86b4f7ee3d3dd9df906b97d269e70d9cc7;p=qemu-xen.git

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

# gpg: Signature made Fri 06 Feb 2015 14:10:40 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:
  monitor: more accurate completion for host_net_remove()
  net: del hub port when peer is deleted
  net: remove the wrong comment in net_init_hubport()
  monitor: print hub port name during info network
  rtl8139: simplify timer logic
  MAINTAINERS: add Jason Wang as net subsystem maintainer

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

cebbae86b4f7ee3d3dd9df906b97d269e70d9cc7