From 0e05e192c0ff706ee2a12eb65074085e3967d862 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Tue, 1 Nov 2011 09:44:56 +0100 Subject: MAINTAINERS: update netfilter maintainers Marc Boucher, James Morris and Rusty Russell were crucial in the early netfilter days. We thank them all! However, they are not actively maintaining netfilter anymore. This patch adds myself as netfilter maintainer. Signed-off-by: Pablo Neira Ayuso --- MAINTAINERS | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 4befa126852e..8edf72bba65f 100644 --- a/MAINTAINERS +++ b/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 -- cgit v1.2.3 From c49b82da1f6649b76acbabc7940ddb53a00bdfcc Mon Sep 17 00:00:00 2001 From: Oliver Hartkopp Date: Wed, 2 Nov 2011 10:55:13 +0000 Subject: MAINTAINERS: Add can-gw include to maintained files Commit c1aabdf379bc2feeb0df7057ed5bad96f492133e (can-gw: add netlink based CAN routing) added a new include file that's neither referenced by any of the CAN maintainers. Signed-off-by: Oliver Hartkopp Signed-off-by: David S. Miller --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 8edf72bba65f..a618408917bd 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1703,6 +1703,7 @@ F: include/linux/can.h F: include/linux/can/core.h F: include/linux/can/bcm.h F: include/linux/can/raw.h +F: include/linux/can/gw.h CAN NETWORK DRIVERS M: Wolfgang Grandegger -- cgit v1.2.3