diff options
| author | James Morris <james.l.morris@oracle.com> | 2016-05-23 21:23:47 +1000 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2016-05-23 21:23:47 +1000 |
| commit | 653bd4568ba083dfd5a06a83de3f0dc1e53dd42b (patch) | |
| tree | 3378a957889156e4a8f122758d4aa8fe52632a6a /MAINTAINERS | |
| parent | 7639dad93a5564579987abded4ec05e3db13659d (diff) | |
| parent | 75aeddd12f205d07b36ed76db3426e974b8f2a21 (diff) | |
| download | linux-653bd4568ba083dfd5a06a83de3f0dc1e53dd42b.tar.gz linux-653bd4568ba083dfd5a06a83de3f0dc1e53dd42b.tar.bz2 linux-653bd4568ba083dfd5a06a83de3f0dc1e53dd42b.zip | |
Merge tag 'keys-next-20160511' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into for-linus
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 5f83015ff016..3084c7582863 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1945,6 +1945,16 @@ L: platform-driver-x86@vger.kernel.org S: Maintained F: drivers/platform/x86/asus-wireless.c +ASYMMETRIC KEYS +M: David Howells <dhowells@redhat.com> +L: keyrings@vger.kernel.org +S: Maintained +F: Documentation/crypto/asymmetric-keys.txt +F: include/linux/verification.h +F: include/crypto/public_key.h +F: include/crypto/pkcs7.h +F: crypto/asymmetric_keys/ + ASYNCHRONOUS TRANSFERS/TRANSFORMS (IOAT) API R: Dan Williams <dan.j.williams@intel.com> W: http://sourceforge.net/projects/xscaleiop @@ -6433,6 +6443,8 @@ S: Maintained F: Documentation/security/keys.txt F: include/linux/key.h F: include/linux/key-type.h +F: include/linux/keyctl.h +F: include/uapi/linux/keyctl.h F: include/keys/ F: security/keys/ |