summary refs log tree commit diff stats
path: root/hw/net/net_tx_pkt.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2016-08-08 15:57:06 +0100
committerPeter Maydell <peter.maydell@linaro.org>2016-08-08 15:57:06 +0100
commit4977bb09ddb7dc97d8452fb1021af14b9695f627 (patch)
treea9a46ccf321af3256a855dcfca28637c786f04e7 /hw/net/net_tx_pkt.c
parentb8dc0fcff10702ab38db2d318f8fa2b8fc5c61b0 (diff)
parenta384c205acaa4b6fe6d4d392af47b49b2c448eb4 (diff)
downloadfocaccia-qemu-4977bb09ddb7dc97d8452fb1021af14b9695f627.tar.gz
focaccia-qemu-4977bb09ddb7dc97d8452fb1021af14b9695f627.zip
Merge remote-tracking branch 'remotes/armbru/tags/pull-monitor-2016-08-08' into staging
Monitor patches for 2016-08-08

# gpg: Signature made Mon 08 Aug 2016 13:24:42 BST
# gpg:                using RSA key 0x3870B400EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>"
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653

* remotes/armbru/tags/pull-monitor-2016-08-08:
  audio: clean up before monitor clean up
  monitor: fix crash when leaving qemu with spice audio

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