| commit | 3159ee58d2133fbf9a710c21201ce717a8cf61a0 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon May 23 17:26:27 2016 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon May 23 17:26:27 2016 -0700 |
| tree | 2c1cbf7507dd9299c3f957299eef4cc59d0f2bd6 | |
| parent | 1d6da87a3241deb13d073c4125d19ed0e5a0c62c [diff] | |
| parent | 653bd4568ba083dfd5a06a83de3f0dc1e53dd42b [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull more security subsystem updates from James Morris:
"Minor updates for the keys code"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
MAINTAINERS: Update keyrings record and add asymmetric keys record
lib: asn1_decoder - add MODULE_LICENSE("GPL")
KEYS: The PKCS#7 test key type should use the secondary keyring