commit 3925e6fc1f774048404fdd910b0345b06c699eb4
author Linus Torvalds <torvalds@linux-foundation.org> Fri Apr 18 18:18:30 2008 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Fri Apr 18 18:18:30 2008 -0700
tree c9a58417d9492f39f7fe81d4721d674c34dd8be2
parent 334d094504c2fe1c44211ecb49146ae6bca8c321
parent 7cea51be4e91edad05bd834f3235b45c57783f0d

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