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>2016-04-05 11:53:53 +0100
committerPeter Maydell <peter.maydell@linaro.org>2016-04-05 11:53:53 +0100
commita226f7653620f8c5b570ca63c26df98bdc1d84c4 (patch)
treea3fc9adc2df6d31f39a5ebeec2a29375ce197be0 /hw/net/virtio-net.c
parentcc621a9838cb045a370717a764907a6d6c47fa76 (diff)
parentc44e92a4151248f80a31c8aa7343e399e508fa95 (diff)
downloadfocaccia-qemu-a226f7653620f8c5b570ca63c26df98bdc1d84c4.tar.gz
focaccia-qemu-a226f7653620f8c5b570ca63c26df98bdc1d84c4.zip
Merge remote-tracking branch 'remotes/berrange/tags/pull-qcrypto-2016-04-05-1' into staging
Merge QCrypto fixes 2016/04/05 v1

# gpg: Signature made Tue 05 Apr 2016 10:53:59 BST using RSA key ID 15104FDF
# gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>"
# gpg:                 aka "Daniel P. Berrange <berrange@redhat.com>"

* remotes/berrange/tags/pull-qcrypto-2016-04-05-1:
  crypto: fix nettle config check for running pbkdf test
  crypto: fix typo in docs for secret object type

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