diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-09-19 11:23:20 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-09-19 11:23:20 +0100 |
| commit | 0f2fa73ba0ca19ebdaccf0d1785583d6601411b6 (patch) | |
| tree | b3e48e62a82daeec5420191f2fe70b92f5341798 /crypto/pbkdf-nettle.c | |
| parent | e3571ae30cd26d19efd4554c25e32ef64d6a36b3 (diff) | |
| parent | 6bd7776cd0a9581cdb5e9dd40df8821a96e355d6 (diff) | |
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
virtio: fixes
virtio feature negotiation rework
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Fri 16 Sep 2016 19:54:54 BST
# gpg: using RSA key 0x281F0DB8D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
# gpg: aka "Michael S. Tsirkin <mst@redhat.com>"
# Primary key fingerprint: 0270 606B 6F3C DF3D 0B17 0970 C350 3912 AFBE 8E67
# Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA 8A0D 281F 0DB8 D28D 5469
* remotes/mst/tags/for_upstream:
MAINTAINERS: add virtio-* tests
virtio-bus: Plug devices after features are negotiated
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
# Conflicts:
# MAINTAINERS
Diffstat (limited to 'crypto/pbkdf-nettle.c')
0 files changed, 0 insertions, 0 deletions