projects / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1d6da87 653bd45)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 24 May 2016 00:26:27 +0000 (17:26 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 24 May 2016 00:26:27 +0000 (17:26 -0700)
commit3159ee58d2133fbf9a710c21201ce717a8cf61a0
tree2c1cbf7507dd9299c3f957299eef4cc59d0f2bd6tree | snapshot
parent1d6da87a3241deb13d073c4125d19ed0e5a0c62ccommit | diff
parent653bd4568ba083dfd5a06a83de3f0dc1e53dd42bcommit | diff
Merge branch 'for-linus' of git://git./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
MAINTAINERS diff1 | diff2 | blob | history
ep93xx device tree rework repo: git://git.maquefel.me/linux.git