OSDN Git Service
(root)
/
sagit-ice-cold
/
kernel_xiaomi_msm8998.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
fdb64f9
f36158c
)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
author
Linus Torvalds
<torvalds@woody.linux-foundation.org>
Thu, 19 Jul 2007 21:42:40 +0000
(14:42 -0700)
committer
Linus Torvalds
<torvalds@woody.linux-foundation.org>
Thu, 19 Jul 2007 21:42:40 +0000
(14:42 -0700)
* '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
Trivial merge