projects
/
linux-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/home/rmk/linux-2.6-arm
[linux-block.git]
/
CREDITS
diff --git
a/CREDITS
b/CREDITS
index 8e577ce4abeb4f44ffcb83a894c66130aebb6a58..6957ef4efab3a2fd60732456e5c515bee68bc57e 100644
(file)
--- a/
CREDITS
+++ b/
CREDITS
@@
-3101,7
+3101,7
@@
S: Minto, NSW, 2566
S: Australia
N: Stephen Smalley
S: Australia
N: Stephen Smalley
-E: sds@
epoch.ncsc.mil
+E: sds@
tycho.nsa.gov
D: portions of the Linux Security Module (LSM) framework and security modules
N: Chris Smith
D: portions of the Linux Security Module (LSM) framework and security modules
N: Chris Smith