| commit | d36ccdbd1ca1050ad4e7b9b16ced848132533f6e | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Wed, 20 Jan 2016 00:02:31 +0000 (19 16:02 -0800) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Wed, 20 Jan 2016 00:02:31 +0000 (19 16:02 -0800) | ||
| tree | f38e51acca6410a38fd89261e6c6de88803cc105 | treesnapshot (tar.gz zip) |
| parent | 7c24d9f3b27b198c3c4dfc8327a25fb077a96219 | commitdiff |
| parent | 23567fd052a9abb6d67fe8e7a9ccdd9800a540f2 | commitdiff |
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
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