| commit | b187e2b53055007fa08ccb9fb120578bae0d02f3 | |
| author | Peter Maydell <peter.maydell@linaro.org> | |
| Wed, 7 Jun 2017 10:16:22 +0000 (7 11:16 +0100) | ||
| committer | Peter Maydell <peter.maydell@linaro.org> | |
| Wed, 7 Jun 2017 10:16:22 +0000 (7 11:16 +0100) | ||
| tree | 72e678b23382c1b754b5bf72de8c9a63b7f4048c | treesnapshot (tar.gz zip) |
| parent | 8b3e9ca74c989859d7e6a3804b141d6c3645e5a2 | commitdiff |
| parent | 6701e5514beab7b781a10424a94e9850c707287c | commitdiff |
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>
# 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>