Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 19 Apr 2008 01:18:30 +0000 (18:18 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 19 Apr 2008 01:18:30 +0000 (18:18 -0700)
* '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

1  2 
include/linux/security.h
net/netlink/af_netlink.c
security/dummy.c
security/security.c
security/selinux/ss/services.c
security/smack/smack_lsm.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge