tree 2c1cbf7507dd9299c3f957299eef4cc59d0f2bd6
parent 1d6da87a3241deb13d073c4125d19ed0e5a0c62c
parent 653bd4568ba083dfd5a06a83de3f0dc1e53dd42b
author Linus Torvalds <torvalds@linux-foundation.org> 1464049587 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1464049587 -0700

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