diff --git a/[refs] b/[refs] index 6485b2df57e9..e8119ab89f4c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a08af810cdc29d2ca930e8a869d3d01744c392d8 +refs/heads/master: 87a0874cf19f1bc9bd25bd7d053a0ea25ccf8373 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 5d4ceba0e960..ca87f470e548 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -4395,10 +4395,10 @@ F: net/*/netfilter/ F: net/netfilter/ NETLABEL -M: Paul Moore +M: Paul Moore W: http://netlabel.sf.net L: netdev@vger.kernel.org -S: Supported +S: Maintained F: Documentation/netlabel/ F: include/net/netlabel.h F: net/netlabel/ @@ -4455,7 +4455,7 @@ F: include/net/ip* F: arch/x86/net/* NETWORKING [LABELED] (NetLabel, CIPSO, Labeled IPsec, SECMARK) -M: Paul Moore +M: Paul Moore L: netdev@vger.kernel.org S: Maintained