]> err.no Git - linux-2.6/commit
projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fdb64f9 f36158c)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 19 Jul 2007 21:42:40 +0000 (14:42 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 19 Jul 2007 21:42:40 +0000 (14:42 -0700)
commit721e2629fa2167c0e5a9f10d704b1fee1621a8cb
treea1580ed191e710f891ef1bf25c8c1fc7d6f054a9tree | snapshot
parentfdb64f93b38a3470fa4db8cd5720b8c731922d1acommit | diff
parentf36158c410651fe66f438c17b2ab3ae813f8c060commit | diff
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
Linux 2.6 source tree