diff options
| author | Peter Maydell | 2017-02-16 13:36:24 +0100 |
|---|---|---|
| committer | Peter Maydell | 2017-02-16 13:36:24 +0100 |
| commit | ca5266de6cde132b647b44a108f6c0c009785fdd (patch) | |
| tree | a3dfadd929794d9ea5bd6bd80cfa76ee6a8a4602 /memory.c | |
| parent | Merge remote-tracking branch 'remotes/rth/tags/pull-or-20170214' into staging (diff) | |
| parent | net: e1000e: fix an infinite loop issue (diff) | |
| download | qemu-ca5266de6cde132b647b44a108f6c0c009785fdd.tar.gz qemu-ca5266de6cde132b647b44a108f6c0c009785fdd.tar.xz qemu-ca5266de6cde132b647b44a108f6c0c009785fdd.zip | |
Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging
# gpg: Signature made Wed 15 Feb 2017 03:46:59 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: e1000e: fix an infinite loop issue
net: imx: limit buffer descriptor count
colo-compare: sort TCP packet queue by sequence number
net: e1000e: fix dead code in e1000e_write_packet_to_guest
net: Mark 'vlan' parameter as deprecated
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'memory.c')
0 files changed, 0 insertions, 0 deletions