summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Wright <chrisw@sous-sol.org>2006-03-11 03:27:19 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-11 09:19:34 -0800
commit692a2061f6f2c360188af72f1f3404a5e7f0efce (patch)
treea0af722a678966b6df2af8dbfcfe64bde15b02ac
parent7cd9013be6c22f3ff6f777354f766c8c0b955e17 (diff)
downloadop-kernel-dev-692a2061f6f2c360188af72f1f3404a5e7f0efce.zip
op-kernel-dev-692a2061f6f2c360188af72f1f3404a5e7f0efce.tar.gz
[PATCH] update email address
Update email address. Signed-off-by: Chris Wright <chrisw@sous-sol.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--CREDITS6
-rw-r--r--MAINTAINERS2
2 files changed, 3 insertions, 5 deletions
diff --git a/CREDITS b/CREDITS
index 6957ef4..64511e2 100644
--- a/CREDITS
+++ b/CREDITS
@@ -3643,11 +3643,9 @@ S: Cambridge. CB1 7EG
S: England
N: Chris Wright
-E: chrisw@osdl.org
+E: chrisw@sous-sol.org
D: hacking on LSM framework and security modules.
-S: c/o OSDL
-S: 12725 SW Millikan Way, Suite 400
-S: Beaverton, OR 97005
+S: Portland, OR
S: USA
N: Michal Wronski
diff --git a/MAINTAINERS b/MAINTAINERS
index c39fb20..4dc34bc 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1631,7 +1631,7 @@ S: Supported
LINUX SECURITY MODULE (LSM) FRAMEWORK
P: Chris Wright
-M: chrisw@osdl.org
+M: chrisw@sous-sol.org
L: linux-security-module@wirex.com
W: http://lsm.immunix.org
T: git kernel.org:/pub/scm/linux/kernel/git/chrisw/lsm-2.6.git
OpenPOWER on IntegriCloud