git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'v3.15' into next
[sfrench/cifs-2.6.git]
/
Documentation
/
security
/
Smack.txt
diff --git
a/Documentation/security/Smack.txt
b/Documentation/security/Smack.txt
index 5597917703e08080783cc4cbfe558f350cac6521..b6ef7e9dba30f52a0c0c222a08158fa543bef211 100644
(file)
--- a/
Documentation/security/Smack.txt
+++ b/
Documentation/security/Smack.txt
@@
-3,7
+3,7
@@
"Good for you, you've decided to clean the elevator!"
- The Elevator, from Dark Star
"Good for you, you've decided to clean the elevator!"
- The Elevator, from Dark Star
-Smack is the
the
Simplified Mandatory Access Control Kernel.
+Smack is the Simplified Mandatory Access Control Kernel.
Smack is a kernel based implementation of mandatory access
control that includes simplicity in its primary design goals.
Smack is a kernel based implementation of mandatory access
control that includes simplicity in its primary design goals.