summary refs log tree commit diff stats
path: root/hw/net/virtio-net.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2017-06-12 19:26:49 +0100
committerPeter Maydell <peter.maydell@linaro.org>2017-06-12 19:26:49 +0100
commit9bba618f18b1a60a3f2668db82b453f6cd9467c0 (patch)
tree25f0ecb76346ccbe6331c8e38fd74a8b1f30be6f /hw/net/virtio-net.c
parent5093f028ce6529034efc8fdc06cec2aa2e2eea63 (diff)
parent27d4c3789ddde40e1c7280150b46eb20a6a892e6 (diff)
downloadfocaccia-qemu-9bba618f18b1a60a3f2668db82b453f6cd9467c0.tar.gz
focaccia-qemu-9bba618f18b1a60a3f2668db82b453f6cd9467c0.zip
Merge remote-tracking branch 'remotes/elmarco/tags/char-pull-request' into staging
# gpg: Signature made Thu 08 Jun 2017 15:12:11 BST
# gpg:                using RSA key 0xDAE8E10975969CE5
# gpg: Good signature from "Marc-André Lureau <marcandre.lureau@redhat.com>"
# gpg:                 aka "Marc-André Lureau <marcandre.lureau@gmail.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: 87A9 BD93 3F87 C606 D276  F62D DAE8 E109 7596 9CE5

* remotes/elmarco/tags/char-pull-request:
  test-char: start a /char/serial test
  chardev: don't use alias names in parse_compat()
  char: fix alias devices regression

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/net/virtio-net.c')
0 files changed, 0 insertions, 0 deletions