diff options
| author | Dong Aisheng <aisheng.dong@nxp.com> | 2019-12-02 18:02:30 +0800 |
|---|---|---|
| committer | Dong Aisheng <aisheng.dong@nxp.com> | 2019-12-02 18:02:30 +0800 |
| commit | 0e41cf483e97ab37b79bcb06eb6582b31404d3b2 (patch) | |
| tree | ae020208b928d0dc9d75e66ad57983a0450bf9ba /arch/arm/include | |
| parent | 96f124e4180dc83550138ad9a3ebe33ec1b3e9ce (diff) | |
| parent | bb7f2bc98a3cf3f483d934d53871784b2bbe5204 (diff) | |
Merge branch 'keys/next' into next
* keys/next:
encrypted_keys: Adds support for secure key-type as master key.
security/keys/secure_key: Adds the secure key support based on CAAM.
Diffstat (limited to 'arch/arm/include')
0 files changed, 0 insertions, 0 deletions