From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 20 Jan 2016 00:02:31 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Tag: v6.1~17322
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d36ccdbd1ca1050ad4e7b9b16ced848132533f6e;p=sdk%2Femulator%2Femulator-kernel.git

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
---

d36ccdbd1ca1050ad4e7b9b16ced848132533f6e