From 3d1ea0761408b4aa8a49b509f3aede37f53fd0c8 Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Sat, 11 Mar 2006 03:27:19 -0800 Subject: [PATCH] --- yaml --- r: 20976 b: refs/heads/master c: 692a2061f6f2c360188af72f1f3404a5e7f0efce h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/CREDITS | 6 ++---- trunk/MAINTAINERS | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 572245474017..f06fe1d67f1e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7cd9013be6c22f3ff6f777354f766c8c0b955e17 +refs/heads/master: 692a2061f6f2c360188af72f1f3404a5e7f0efce diff --git a/trunk/CREDITS b/trunk/CREDITS index 6957ef4efab3..64511e2abc8e 100644 --- a/trunk/CREDITS +++ b/trunk/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/trunk/MAINTAINERS b/trunk/MAINTAINERS index c39fb20f8589..4dc34bc4a287 100644 --- a/trunk/MAINTAINERS +++ b/trunk/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