diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-08-09 10:44:27 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-08-09 10:44:27 +0100 |
| commit | ab861f3915e8667927cf18ad97f71cae7ccf8818 (patch) | |
| tree | 6b8917d16c174baeb34e5dd8ceec838cdaf2dca2 /hw/ide/cmd646.c | |
| parent | 53279c76cf071fed07a336948d37c72e3613e0b7 (diff) | |
| parent | a0d1cbdacff5df4ded16b753b38fdd9da6092968 (diff) | |
| download | qemu-ab861f3915e8667927cf18ad97f71cae7ccf8818.tar.gz | |
Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging
# gpg: Signature made Tue 09 Aug 2016 08:28:39 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:
hw/net: Fix a heap overflow in xlnx.xps-ethernetlite
net: vmxnet3: check for device_active before write
net: check fragment length during fragmentation
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/ide/cmd646.c')
0 files changed, 0 insertions, 0 deletions