| commit | 062fcb27c4c1af6902f497ec9316c1c0ead90e81 | |
| author | Peter Maydell <peter.maydell@linaro.org> | |
| Tue, 19 Dec 2017 12:48:56 +0000 (19 12:48 +0000) | ||
| committer | Peter Maydell <peter.maydell@linaro.org> | |
| Tue, 19 Dec 2017 12:48:56 +0000 (19 12:48 +0000) | ||
| tree | e765b668c540201a3159ad24ecc1f23c80eb2270 | treesnapshot (tar.gz zip) |
| parent | 46db367db704da87e4beb29db84a0e4978d93235 | commitdiff |
| parent | 89be9e99c83095af25ce16907143c31f2959188b | commitdiff |
Merge remote-tracking branch 'remotes/stefanberger/tags/pull-tpm-2017-12-19-1' into staging
Merge tpm 2017/12/19 v1
# gpg: Signature made Tue 19 Dec 2017 11:51:13 GMT
# gpg: using RSA key 0x75AD65802A0B4211
# gpg: Good signature from "Stefan Berger <stefanb@linux.vnet.ibm.com>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: B818 B9CA DF90 89C2 D5CE C66B 75AD 6580 2A0B 4211
* remotes/stefanberger/tags/pull-tpm-2017-12-19-1:
tpm: move qdev_prop_tpm to hw/tpm/
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Merge tpm 2017/12/19 v1
# gpg: Signature made Tue 19 Dec 2017 11:51:13 GMT
# gpg: using RSA key 0x75AD65802A0B4211
# gpg: Good signature from "Stefan Berger <stefanb@linux.vnet.ibm.com>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: B818 B9CA DF90 89C2 D5CE C66B 75AD 6580 2A0B 4211
* remotes/stefanberger/tags/pull-tpm-2017-12-19-1:
tpm: move qdev_prop_tpm to hw/tpm/
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>