diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-19 11:46:08 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-19 11:46:08 -0800 |
commit | afd290945cd283030b51b433a66fe57a8feb28c8 (patch) | |
tree | a389cb472d0ca242e02e86becd4a1967dfb0624b /fs/libfs.c | |
parent | 90a4c0f51e8e44111a926be6f4c87af3938a79c3 (diff) | |
parent | 456a8167e94b66f406c27400a46a707b870452b0 (diff) |
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/libfs.c')
0 files changed, 0 insertions, 0 deletions