diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-11-14 13:53:00 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-11-14 13:53:00 +0000 |
| commit | 9895606363615a0d2a9554c9dadc7c57ec81f969 (patch) | |
| tree | fe8da0a472178ba3869925110859ce78587cd54b /hw/display/framebuffer.c | |
| parent | 55ed8d600abfd09de89393b3a6bd506793edd874 (diff) | |
| parent | bb160b571fe469b03228d4502c75a18045978a74 (diff) | |
| download | qemu-9895606363615a0d2a9554c9dadc7c57ec81f969.zip qemu-9895606363615a0d2a9554c9dadc7c57ec81f969.tar.gz qemu-9895606363615a0d2a9554c9dadc7c57ec81f969.tar.bz2 | |
Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging
# gpg: Signature made Tue 14 Nov 2017 02:05:34 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:
net/socket: fix coverity issue
Add new PCI ID for i82559a
Fix eepro100 simple transmission mode
colo: Consolidate the duplicate code chunk into a routine
colo-compare: Fix comments
colo-compare: compare the packet in a specified Connection
colo-compare: Insert packet into the suitable position of packet queue directly
net: fix check for number of parameters to -netdev socket
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/display/framebuffer.c')
0 files changed, 0 insertions, 0 deletions