tree 19ce55af8e8732aa61cb8db529cf2304d9d738b5
parent 795e2fe0a3b69dbc040d7efcf517e0cbad6901d0
parent 4303154e86597885bc3cbc178a48ccbc8213875f
author Linus Torvalds <torvalds@linux-foundation.org> 1238286642 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1238286642 -0700

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:
  smack: Add a new '-CIPSO' option to the network address label configuration
  netlabel: Cleanup the Smack/NetLabel code to fix incoming TCP connections
  lsm: Remove the socket_post_accept() hook
  selinux: Remove the "compat_net" compatibility code
  netlabel: Label incoming TCP connections correctly in SELinux
  lsm: Relocate the IPv4 security_inet_conn_request() hooks
  TOMOYO: Fix a typo.
  smack: convert smack to standard linux lists