diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-11-27 10:44:42 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-11-27 10:44:42 +0000 |
| commit | 714487515dbe0c65d5904251e796cd3a5b3579fb (patch) | |
| tree | 2a1fbe4264ff8022814af20a6924eb32beaa7746 /trace/simple.c | |
| parent | b04fc428356a540fdb9065fa8c3c71ee476c2031 (diff) | |
| parent | b73c1849148da1229a3c3b336311a8194970b35f (diff) | |
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>
Diffstat (limited to 'trace/simple.c')
0 files changed, 0 insertions, 0 deletions