diff options
| author | Peter Maydell | 2016-02-02 16:55:01 +0100 |
|---|---|---|
| committer | Peter Maydell | 2016-02-02 16:55:01 +0100 |
| commit | d2ea854c382d4d080de1f149167e60290108f79b (patch) | |
| tree | 00051250d83843a25f368c5c58b8bb7f3514f5f1 /trace/event-internal.h | |
| parent | Merge remote-tracking branch 'remotes/kraxel/tags/pull-ui-20160202-1' into st... (diff) | |
| parent | crypto: ensure qcrypto_hash_digest_len is always defined (diff) | |
| download | qemu-d2ea854c382d4d080de1f149167e60290108f79b.tar.gz qemu-d2ea854c382d4d080de1f149167e60290108f79b.tar.xz qemu-d2ea854c382d4d080de1f149167e60290108f79b.zip | |
Merge remote-tracking branch 'remotes/berrange/tags/pull-qcrypto-next-2016-02-02-1' into staging
Merge qcrypto-next 2016/2/2 v1
# gpg: Signature made Tue 02 Feb 2016 13:13:05 GMT 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-next-2016-02-02-1:
crypto: ensure qcrypto_hash_digest_len is always defined
crypto: register properties against the class instead of object
crypto: fix description of @errp parameter initialization
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'trace/event-internal.h')
0 files changed, 0 insertions, 0 deletions