diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-09-21 10:56:09 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-09-21 10:56:09 +0100 |
| commit | ff5667ed53c544c4dc88dcd7cb23cc509c9a55e0 (patch) | |
| tree | 68ab499eebf7011c0956792f06341ac33ac59794 /block/vmdk.c | |
| parent | 211ad3b412fe1b8edcb7db0bb97e766a39b2be14 (diff) | |
| parent | 8d9329719cc0996e5837fb466ca4d7be8030f8c9 (diff) | |
Merge remote-tracking branch 'remotes/mcayland/tags/qemu-sparc-signed' into staging
qemu-sparc update
# gpg: Signature made Thu 21 Sep 2017 08:42:30 BST
# gpg: using RSA key 0x5BC2C56FAE0F321F
# gpg: Good signature from "Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>"
# Primary key fingerprint: CC62 1AB9 8E82 200D 915C C9C4 5BC2 C56F AE0F 321F
* remotes/mcayland/tags/qemu-sparc-signed:
sun4u: use sunhme as default on-board NIC
net: add Sun HME (Happy Meal Ethernet) on-board NIC
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'block/vmdk.c')
0 files changed, 0 insertions, 0 deletions