summaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2018-02-05 09:31:37 +0000
committerPeter Maydell <peter.maydell@linaro.org>2018-02-05 09:31:37 +0000
commit2b3805f370521deacab974b9c9ca07d2319a8890 (patch)
tree65c916774a544ba8f6d866b823e242db2ccbf5f8 /MAINTAINERS
parentf24ee107a07f093bd7ed475dd48d7ba57ea3d8fe (diff)
parent3bd9e16149de3965a9880a20826a28b7b94bd4a7 (diff)
downloadqemu-2b3805f370521deacab974b9c9ca07d2319a8890.tar.gz
Merge remote-tracking branch 'remotes/stefanberger/tags/pull-tpm-2018-02-03-1' into staging
Merge tpm 2018/02/03 v1 # gpg: Signature made Sat 03 Feb 2018 14:02:35 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-03-1: tpm: tis: move one-line function into caller MAINTAINERS: add pointer to tpm-next repository tpm: wrap stX_be_p in tpm_cmd_set_XYZ functions tpm: Split off tpm_crb_reset function Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS1
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 0f952d46ce..bbc3a617c2 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1602,6 +1602,7 @@ F: include/hw/acpi/tpm.h
F: include/sysemu/tpm*
F: qapi/tpm.json
F: backends/tpm.c
+T: git git://github.com/stefanberger/qemu-tpm.git tpm-next
Checkpatch
S: Odd Fixes