From: Chris Wright <chrisw@sous-sol.org>
Date: Sat, 11 Mar 2006 11:27:19 +0000 (-0800)
Subject: [PATCH] update email address
X-Git-Tag: v2.6.16-rc6~19
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=692a2061f6f2c360188af72f1f3404a5e7f0efce;p=linux-2.6

[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>
---

diff --git a/CREDITS b/CREDITS
index 6957ef4efa..64511e2abc 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 c39fb20f85..4dc34bc4a2 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