diff --git a/[refs] b/[refs] index 1f47f5d46e0f..f77aff3f9071 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2dad81adf2c49aa9f8bb7e7c48dff9261bd58396 +refs/heads/master: 0e05e192c0ff706ee2a12eb65074085e3967d862 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 4befa126852e..8edf72bba65f 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -4452,11 +4452,9 @@ F: Documentation/networking/vxge.txt F: drivers/net/ethernet/neterion/ NETFILTER/IPTABLES/IPCHAINS -P: Rusty Russell -P: Marc Boucher -P: James Morris P: Harald Welte P: Jozsef Kadlecsik +M: Pablo Neira Ayuso M: Patrick McHardy L: netfilter-devel@vger.kernel.org L: netfilter@vger.kernel.org