[GIT PULL] Security subsystem updates

[James Morris]

Please pull these minor updates for the keys code.


The following changes since commit 7639dad93a5564579987abded4ec05e3db13659d:

  Merge tag 'trace-v4.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace (2016-05-22 19:40:39 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git for-linus

David Howells (2):
      KEYS: The PKCS#7 test key type should use the secondary keyring
      MAINTAINERS: Update keyrings record and add asymmetric keys record

James Morris (1):
      Merge tag 'keys-next-20160511' of git://git.kernel.org/.../dhowells/linux-fs into for-linus

Tudor Ambarus (1):
      lib: asn1_decoder - add MODULE_LICENSE("GPL")

 MAINTAINERS                             |   12 ++++++++++++
 crypto/asymmetric_keys/pkcs7_key_type.c |    2 +-
 2 files changed, 13 insertions(+), 1 deletions(-)