diff options
| author | Peter Maydell | 2017-01-06 13:10:40 +0100 |
|---|---|---|
| committer | Peter Maydell | 2017-01-06 13:10:40 +0100 |
| commit | a01b1e9a005d523ec6452ec7137885d11f8a30df (patch) | |
| tree | 503fa56183265f708dfe6e500ea150d7819c48f8 /include/ui/gtk.h | |
| parent | Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into ... (diff) | |
| parent | fsl_etsec: Fix Tx BD ring wrapping handling (diff) | |
| download | qemu-a01b1e9a005d523ec6452ec7137885d11f8a30df.tar.gz qemu-a01b1e9a005d523ec6452ec7137885d11f8a30df.tar.xz qemu-a01b1e9a005d523ec6452ec7137885d11f8a30df.zip | |
Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging
# gpg: Signature made Fri 06 Jan 2017 02:55:49 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:
fsl_etsec: Fix Tx BD ring wrapping handling
rtl8139: correctly handle PHY reset
record/replay: add network support
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/ui/gtk.h')
0 files changed, 0 insertions, 0 deletions