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 remote-tracking branches 'regulator/topic/da9211', 'regulator/topic/pfuze100...
[sfrench/cifs-2.6.git]
/
CREDITS
diff --git
a/CREDITS
b/CREDITS
index 0d2d60de5a2539cc48c21eee25a226b08b8a2040..9fbd2c77b5462d71dd9d24b5966c03d528094ce6 100644
(file)
--- a/
CREDITS
+++ b/
CREDITS
@@
-2606,11
+2606,9
@@
E: tmolina@cablespeed.com
D: bug fixes, documentation, minor hackery
N: Paul Moore
D: bug fixes, documentation, minor hackery
N: Paul Moore
-E: paul.moore@hp.com
-D: NetLabel author
-S: Hewlett-Packard
-S: 110 Spit Brook Road
-S: Nashua, NH 03062
+E: paul@paul-moore.com
+W: http://www.paul-moore.com
+D: NetLabel, SELinux, audit
N: James Morris
E: jmorris@namei.org
N: James Morris
E: jmorris@namei.org