diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-01-29 14:29:17 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-01-29 14:29:17 +0000 |
| commit | 0d1442912b3d6591a57ee45fbf28bc91e58d9e76 (patch) | |
| tree | 5150b12645c0d413fe8f3b1da83e607ffa497f4f /hw/watchdog | |
| parent | fccfcc6328d1986ce849183d37901a7cf59ed3ce (diff) | |
| parent | bf4835a4d5338bb7424827715df22570a8adc67c (diff) | |
Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging
# gpg: Signature made Mon 29 Jan 2018 08:14:19 GMT
# 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:
MAINTAINERS: update Dmitry Fleytman email
qemu-doc: Get rid of "vlan=X" example in the documentation
net: Allow netdevs to be used with 'hostfwd_add' and 'hostfwd_remove'
net: Allow hubports to connect to other netdevs
colo: compare the packet based on the tcp sequence number
colo: modified the payload compare function
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/watchdog')
0 files changed, 0 insertions, 0 deletions