diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-19 17:42:40 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-19 17:42:40 -0400 |
| commit | 721e2629fa2167c0e5a9f10d704b1fee1621a8cb (patch) | |
| tree | a1580ed191e710f891ef1bf25c8c1fc7d6f054a9 /drivers/ide/pci/ns87415.c | |
| parent | fdb64f93b38a3470fa4db8cd5720b8c731922d1a (diff) | |
| parent | f36158c410651fe66f438c17b2ab3ae813f8c060 (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
Diffstat (limited to 'drivers/ide/pci/ns87415.c')
0 files changed, 0 insertions, 0 deletions