aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CREDITS6
-rw-r--r--MAINTAINERS2
2 files changed, 3 insertions, 5 deletions
diff --git a/CREDITS b/CREDITS
index 6957ef4efab3..64511e2abc8e 100644
--- a/CREDITS
+++ b/CREDITS
@@ -3643,11 +3643,9 @@ S: Cambridge. CB1 7EG
3643S: England 3643S: England
3644 3644
3645N: Chris Wright 3645N: Chris Wright
3646E: chrisw@osdl.org 3646E: chrisw@sous-sol.org
3647D: hacking on LSM framework and security modules. 3647D: hacking on LSM framework and security modules.
3648S: c/o OSDL 3648S: Portland, OR
3649S: 12725 SW Millikan Way, Suite 400
3650S: Beaverton, OR 97005
3651S: USA 3649S: USA
3652 3650
3653N: Michal Wronski 3651N: Michal Wronski
diff --git a/MAINTAINERS b/MAINTAINERS
index c39fb20f8589..4dc34bc4a287 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1631,7 +1631,7 @@ S: Supported
1631 1631
1632LINUX SECURITY MODULE (LSM) FRAMEWORK 1632LINUX SECURITY MODULE (LSM) FRAMEWORK
1633P: Chris Wright 1633P: Chris Wright
1634M: chrisw@osdl.org 1634M: chrisw@sous-sol.org
1635L: linux-security-module@wirex.com 1635L: linux-security-module@wirex.com
1636W: http://lsm.immunix.org 1636W: http://lsm.immunix.org
1637T: git kernel.org:/pub/scm/linux/kernel/git/chrisw/lsm-2.6.git 1637T: git kernel.org:/pub/scm/linux/kernel/git/chrisw/lsm-2.6.git