summaryrefslogtreecommitdiffstats
path: root/Documentation/translations
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-11-24 07:51:27 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2017-11-24 07:51:27 +0100
commitdab0badc8735f4e8bf07bc56bdeefce91d413924 (patch)
tree1b7f175d6bffe4ee6d93d1828a730daccf1d77d0 /Documentation/translations
parentMerge tag 'apparmor-pr-2017-11-21' of git://git.kernel.org/pub/scm/linux/kern... (diff)
parentMerge tag 'keys-next-20171123' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff)
downloadlinux-dab0badc8735f4e8bf07bc56bdeefce91d413924.tar.xz
linux-dab0badc8735f4e8bf07bc56bdeefce91d413924.zip
Merge branch 'next-keys' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull keys update from James Morris: "There's nothing too controversial here: - Doc fix for keyctl_read(). - time_t -> time64_t replacement. - Set the module licence on things to prevent tainting" * 'next-keys' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: pkcs7: Set the module licence to prevent tainting security: keys: Replace time_t with time64_t for struct key_preparsed_payload security: keys: Replace time_t/timespec with time64_t KEYS: fix in-kernel documentation for keyctl_read()
Diffstat (limited to 'Documentation/translations')
0 files changed, 0 insertions, 0 deletions