diff options
author | Peter Maydell | 2018-06-26 10:45:13 +0200 |
---|---|---|
committer | Peter Maydell | 2018-06-26 10:45:14 +0200 |
commit | 595123df1d54ed8fbab9e1a73d5a58c5bb71058f (patch) | |
tree | e97e97af5a2e41126a88e51aff3b4a882b3b12df /hw/net/virtio-net.c | |
parent | Merge remote-tracking branch 'remotes/kraxel/tags/audio-20180625-pull-request... (diff) | |
parent | ahci: fix FIS I bit and PIO Setup FIS interrupt (diff) | |
download | qemu-595123df1d54ed8fbab9e1a73d5a58c5bb71058f.tar.gz qemu-595123df1d54ed8fbab9e1a73d5a58c5bb71058f.tar.xz qemu-595123df1d54ed8fbab9e1a73d5a58c5bb71058f.zip |
Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging
Pull request
# gpg: Signature made Mon 25 Jun 2018 22:11:06 BST
# gpg: using RSA key 7DEF8106AAFC390E
# gpg: Good signature from "John Snow (John Huston) <jsnow@redhat.com>"
# Primary key fingerprint: FAEB 9711 A12C F475 812F 18F2 88A9 064D 1835 61EB
# Subkey fingerprint: F9B7 ABDB BCAC DF95 BE76 CBD0 7DEF 8106 AAFC 390E
* remotes/jnsnow/tags/ide-pull-request:
ahci: fix FIS I bit and PIO Setup FIS interrupt
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/net/virtio-net.c')
0 files changed, 0 insertions, 0 deletions