diff --git a/[refs] b/[refs] index 8973755ebbcc..978e3a189237 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e7c243c925f6d9dcb898504ff24d6650b5cbb3b1 +refs/heads/master: 10e2ff1c39e6d829379c7c5bb8f1c8f512f257c8 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 10a6f57776b2..48ca8b47150d 100644 --- a/trunk/MAINTAINERS +++ b/trunk/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