diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-23 17:26:27 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-23 17:26:27 -0700 |
| commit | 3159ee58d2133fbf9a710c21201ce717a8cf61a0 (patch) | |
| tree | 2c1cbf7507dd9299c3f957299eef4cc59d0f2bd6 /include/trace | |
| parent | Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux (diff) | |
| parent | Merge tag 'keys-next-20160511' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into for-linus (diff) | |
| download | linux-dev-3159ee58d2133fbf9a710c21201ce717a8cf61a0.tar.xz linux-dev-3159ee58d2133fbf9a710c21201ce717a8cf61a0.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'include/trace')
0 files changed, 0 insertions, 0 deletions