summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2007-08-25 23:41:28 +0200
committerDavid S. Miller <davem@sunset.davemloft.net>2007-08-27 03:35:48 +0200
commit10e2ff1c39e6d829379c7c5bb8f1c8f512f257c8 (patch)
tree281ca6b01e3b02fd4c0396ea617da7d8acf2f04c
parent[VLAN/BRIDGE]: Fix "skb_pull_rcsum - Fatal exception in interrupt" (diff)
downloadlinux-10e2ff1c39e6d829379c7c5bb8f1c8f512f257c8.tar.xz
linux-10e2ff1c39e6d829379c7c5bb8f1c8f512f257c8.zip
[NET]: Mark Paul Moore as maintainer of labelled networking.
Signed-off-by: James Morris <jmorris@namei.org> Acked-by: Paul Moore <paul.moore@hp.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--MAINTAINERS6
1 files changed, 6 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 10a6f57776b2..48ca8b47150d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2661,6 +2661,12 @@ L: netdev@vger.kernel.org
T: git kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git
S: Maintained
+NETWORKING [LABELED] (NetLabel, CIPSO, Labeled IPsec, SECMARK)
+P: Paul Moore
+M: paul.moore@hp.com
+L: netdev@vger.kernel.org
+S: Maintained
+
NETWORKING [WIRELESS]
P: John W. Linville
M: linville@tuxdriver.com