Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 20 Jan 2016 00:02:31 +0000 (16:02 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 20 Jan 2016 00:02:31 +0000 (16:02 -0800)
commitd36ccdbd1ca1050ad4e7b9b16ced848132533f6e
treef38e51acca6410a38fd89261e6c6de88803cc105
parent7c24d9f3b27b198c3c4dfc8327a25fb077a96219
parent23567fd052a9abb6d67fe8e7a9ccdd9800a540f2
Merge branch 'for-linus' of git://git./linux/kernel/git/jmorris/linux-security

Pull security subsystem update from James Morris:
 "A CVE fix and a maintainers file update"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  KEYS: Fix keyring ref leak in join_session_keyring()
  Fix the MAINTAINERS record for the certs/ directory