diff options
| author | Peter Maydell | 2016-08-22 11:02:28 +0200 |
|---|---|---|
| committer | Peter Maydell | 2016-08-22 11:02:28 +0200 |
| commit | 62680fad7fd63b1f5cfd049a85993e4b24b03958 (patch) | |
| tree | 15de9d71ff314a1ae46f25b221ddb89e782f2977 /bsd-user/main.c | |
| parent | test-logging: don't hard-code paths in /tmp (diff) | |
| parent | e1000e: remove internal interrupt flag (diff) | |
| download | qemu-62680fad7fd63b1f5cfd049a85993e4b24b03958.tar.gz qemu-62680fad7fd63b1f5cfd049a85993e4b24b03958.tar.xz qemu-62680fad7fd63b1f5cfd049a85993e4b24b03958.zip | |
Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging
# gpg: Signature made Mon 22 Aug 2016 09:06:32 BST
# gpg: using RSA key 0xEF04965B398D6211
# 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:
e1000e: remove internal interrupt flag
slirp: fix segv when init failed
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'bsd-user/main.c')
0 files changed, 0 insertions, 0 deletions