diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-03-01 10:13:21 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-03-01 10:13:21 +0000 |
| commit | 5116c331c6181d96ef94e80046d03140c7f8e981 (patch) | |
| tree | 67f25e03e9ef52b567ce3da08bb7a917702daf2b /MAINTAINERS | |
| parent | 6697439794f72b3501ee16bb95d16854f9981421 (diff) | |
| parent | adb0e917e6ee93631e40265ca145bc31cd3b6c9a (diff) | |
| download | qemu-5116c331c6181d96ef94e80046d03140c7f8e981.zip qemu-5116c331c6181d96ef94e80046d03140c7f8e981.tar.gz qemu-5116c331c6181d96ef94e80046d03140c7f8e981.tar.bz2 | |
Merge remote-tracking branch 'remotes/stefanberger/tags/pull-tpm-2018-02-21-2' into staging
Merge tpm 2018/02/21 v2
# gpg: Signature made Tue 27 Feb 2018 13:50:28 GMT
# gpg: using RSA key 75AD65802A0B4211
# 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-2018-02-21-2:
tests: add test for TPM TIS device
tests: Move common TPM test code into tpm-emu.c
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index a334a25..79fb830 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1639,6 +1639,7 @@ F: include/hw/acpi/tpm.h F: include/sysemu/tpm* F: qapi/tpm.json F: backends/tpm.c +F: tests/*tpm* T: git git://github.com/stefanberger/qemu-tpm.git tpm-next Checkpatch |