path: root/scripts
diff options
authorLinus Torvalds <>2021-04-26 08:31:03 -0700
committerLinus Torvalds <>2021-04-26 08:31:03 -0700
commit87f27e7b189f54a9e928efb4ea98bf375708ff1f (patch)
tree1cac75316c6ac183348aa39955726b061b5c15da /scripts
parent7dd1ce1a526cb444bd2308c9fda52add4c532ac1 (diff)
parent60dc5f1bcfaa9cae9f99637e347d068cad7f8c9f (diff)
Merge tag 'queue' of git://
Pull tpm fixes from James Bottomley: "Fix a regression in the TPM trusted keys caused by the generic rework to add ARM TEE based trusted keys. Without this fix, the TPM trusted key subsystem fails to add or load any keys" * tag 'queue' of git:// KEYS: trusted: fix TPM trusted keys for generic framework
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions