Merge remote-tracking branch 'remotes/stefanha/tags/net-pull-request' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Sun, 29 Jun 2014 11:45:54 +0000 (12:45 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Sun, 29 Jun 2014 11:45:54 +0000 (12:45 +0100)
commit76fbbec9315f8712d921411fbb4dad1fbcf1b151
tree30b76243b8a5c98b64840c40e65597f94c08bfa0
parent2d80e0ab4b4326e340df7e0bcc687b2bc63c68d8
parent5e80dd223ded254b1802bdd6417ef118456eadce
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>