summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-04-19 03:18:30 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-19 03:18:30 +0200
commit3925e6fc1f774048404fdd910b0345b06c699eb4 (patch)
treec9a58417d9492f39f7fe81d4721d674c34dd8be2 /arch
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.26 (diff)
parentsecurity: fix up documentation for security_module_enable (diff)
downloadlinux-3925e6fc1f774048404fdd910b0345b06c699eb4.tar.xz
linux-3925e6fc1f774048404fdd910b0345b06c699eb4.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: security: fix up documentation for security_module_enable Security: Introduce security= boot parameter Audit: Final renamings and cleanup SELinux: use new audit hooks, remove redundant exports Audit: internally use the new LSM audit hooks LSM/Audit: Introduce generic Audit LSM hooks SELinux: remove redundant exports Netlink: Use generic LSM hook Audit: use new LSM hooks instead of SELinux exports SELinux: setup new inode/ipc getsecid hooks LSM: Introduce inode_getsecid and ipc_getsecid hooks
Diffstat (limited to 'arch')
0 files changed, 0 insertions, 0 deletions