From: Peter Maydell <peter.maydell@linaro.org>
Date: Fri, 27 Nov 2015 10:44:42 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=714487515dbe0c65d5904251e796cd3a5b3579fb;p=qemu.git

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

# gpg: Signature made Fri 27 Nov 2015 02:42:02 GMT using RSA key ID 398D6211
# gpg: Good signature from "Jason Wang (Jason Wang on RedHat) <jasowang@redhat.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 215D 46F4 8246 689E C77F  3562 EF04 965B 398D 6211

* remotes/jasowang/tags/net-pull-request:
  tap-win32: disable broken async write path
  tap-win32: skip unexpected nodes during registry enumeration
  eepro100: Prevent two endless loops

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

714487515dbe0c65d5904251e796cd3a5b3579fb