diff --git a/[refs] b/[refs] index 0d81239ee6e7..ad437d920a8f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c08de5d5308ae0d20290344551ddd9cea8ded661 +refs/heads/master: 82b985434c5e9ceee772ca206889a856a7a4a200 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index a2b6d9fa3502..208da3c320c7 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -2049,11 +2049,13 @@ P: Marc Boucher P: James Morris P: Harald Welte P: Jozsef Kadlecsik -M: coreteam@netfilter.org +P: Patrick McHardy +M: kaber@trash.net +L: netfilter-devel@lists.netfilter.org +L: netfilter@lists.netfilter.org +L: coreteam@netfilter.org W: http://www.netfilter.org/ W: http://www.iptables.org/ -L: netfilter@lists.netfilter.org -L: netfilter-devel@lists.netfilter.org S: Supported NETLABEL