tree a1580ed191e710f891ef1bf25c8c1fc7d6f054a9
parent fdb64f93b38a3470fa4db8cd5720b8c731922d1a
parent f36158c410651fe66f438c17b2ab3ae813f8c060
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1184881360 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1184881360 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6:
  SELinux: use SECINITSID_NETMSG instead of SECINITSID_UNLABELED for NetLabel
  SELinux: enable dynamic activation/deactivation of NetLabel/SELinux enforcement