diff options
| author | Peter Maydell | 2017-06-07 12:16:22 +0200 |
|---|---|---|
| committer | Peter Maydell | 2017-06-07 12:16:22 +0200 |
| commit | b187e2b53055007fa08ccb9fb120578bae0d02f3 (patch) | |
| tree | 72e678b23382c1b754b5bf72de8c9a63b7f4048c /hw/intc/intc.c | |
| parent | Merge remote-tracking branch 'remotes/rth/tags/pull-s390-20170606' into staging (diff) | |
| parent | Revert "Change net/socket.c to use socket_*() functions" again (diff) | |
| download | qemu-b187e2b53055007fa08ccb9fb120578bae0d02f3.tar.gz qemu-b187e2b53055007fa08ccb9fb120578bae0d02f3.tar.xz qemu-b187e2b53055007fa08ccb9fb120578bae0d02f3.zip | |
Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging
# gpg: Signature made Wed 07 Jun 2017 04:29:20 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:
Revert "Change net/socket.c to use socket_*() functions" again
net/rocker: Cleanup the useless return value check
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/intc/intc.c')
0 files changed, 0 insertions, 0 deletions