Merge master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6-omap-h63xx.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index c39fb20f85893510649d87bb69bd9d5752fb42e0..3d7d30dc5439b602cfad8f727345bd7de06dd550 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1631,8 +1631,8 @@ S:        Supported
 
 LINUX SECURITY MODULE (LSM) FRAMEWORK
 P:     Chris Wright
-M:     chrisw@osdl.org
-L:     linux-security-module@wirex.com
+M:     chrisw@sous-sol.org
+L:     linux-security-module@vger.kernel.org
 W:     http://lsm.immunix.org
 T:     git kernel.org:/pub/scm/linux/kernel/git/chrisw/lsm-2.6.git
 S:     Supported