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