From: Peter Maydell <peter.maydell@linaro.org>
Date: Sun, 29 Jun 2014 11:45:54 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/stefanha/tags/net-pull-request' into staging
X-Git-Tag: qemu-xen-4.6.0-rc1~347
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=76fbbec9315f8712d921411fbb4dad1fbcf1b151;p=qemu-upstream-4.6-testing.git

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

Net patches

# gpg: Signature made Fri 27 Jun 2014 14:10:57 BST 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:
  hw/net/eepro100: Implement read-only bits in MDI registers
  net: move queue number into NICPeers
  net: L2TPv3 transport
  qemu-bridge-helper: Fix fd leak in main()

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

76fbbec9315f8712d921411fbb4dad1fbcf1b151