aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-01-19 11:46:08 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-01-19 11:46:08 -0800
commitafd290945cd283030b51b433a66fe57a8feb28c8 (patch)
treea389cb472d0ca242e02e86becd4a1967dfb0624b /fs
parentuml: fix compile for x86-64 (diff)
parentKEYS: Permit key_serial() to be called with a const key pointer (diff)
downloadlinux-dev-afd290945cd283030b51b433a66fe57a8feb28c8.tar.xz
linux-dev-afd290945cd283030b51b433a66fe57a8feb28c8.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: KEYS: Permit key_serial() to be called with a const key pointer keys: fix user_defined key sparse messages ima: fix cred sparse warning MPILIB: Add a missing ENOMEM check
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions