aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS21
1 files changed, 16 insertions, 5 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 3341d92ff002..47cc449d89d8 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1405,20 +1405,30 @@ F: arch/x86/include/asm/calgary.h
1405F: arch/x86/include/asm/tce.h 1405F: arch/x86/include/asm/tce.h
1406 1406
1407CAN NETWORK LAYER 1407CAN NETWORK LAYER
1408M: Urs Thuermann <urs.thuermann@volkswagen.de> 1408M: Oliver Hartkopp <socketcan@hartkopp.net>
1409M: Oliver Hartkopp <oliver.hartkopp@volkswagen.de> 1409M: Oliver Hartkopp <oliver.hartkopp@volkswagen.de>
1410L: socketcan-core@lists.berlios.de (subscribers-only) 1410M: Urs Thuermann <urs.thuermann@volkswagen.de>
1411L: socketcan-core@lists.berlios.de
1412L: netdev@vger.kernel.org
1411W: http://developer.berlios.de/projects/socketcan/ 1413W: http://developer.berlios.de/projects/socketcan/
1412S: Maintained 1414S: Maintained
1413F: drivers/net/can/ 1415F: net/can/
1414F: include/linux/can/
1415F: include/linux/can.h 1416F: include/linux/can.h
1417F: include/linux/can/core.h
1418F: include/linux/can/bcm.h
1419F: include/linux/can/raw.h
1416 1420
1417CAN NETWORK DRIVERS 1421CAN NETWORK DRIVERS
1418M: Wolfgang Grandegger <wg@grandegger.com> 1422M: Wolfgang Grandegger <wg@grandegger.com>
1419L: socketcan-core@lists.berlios.de (subscribers-only) 1423L: socketcan-core@lists.berlios.de
1424L: netdev@vger.kernel.org
1420W: http://developer.berlios.de/projects/socketcan/ 1425W: http://developer.berlios.de/projects/socketcan/
1421S: Maintained 1426S: Maintained
1427F: drivers/net/can/
1428F: include/linux/can/dev.h
1429F: include/linux/can/error.h
1430F: include/linux/can/netlink.h
1431F: include/linux/can/platform/
1422 1432
1423CELL BROADBAND ENGINE ARCHITECTURE 1433CELL BROADBAND ENGINE ARCHITECTURE
1424M: Arnd Bergmann <arnd@arndb.de> 1434M: Arnd Bergmann <arnd@arndb.de>
@@ -2130,6 +2140,7 @@ F: drivers/net/eexpress.*
2130ETHERNET BRIDGE 2140ETHERNET BRIDGE
2131M: Stephen Hemminger <shemminger@linux-foundation.org> 2141M: Stephen Hemminger <shemminger@linux-foundation.org>
2132L: bridge@lists.linux-foundation.org 2142L: bridge@lists.linux-foundation.org
2143L: netdev@vger.kernel.org
2133W: http://www.linux-foundation.org/en/Net:Bridge 2144W: http://www.linux-foundation.org/en/Net:Bridge
2134S: Maintained 2145S: Maintained
2135F: include/linux/netfilter_bridge/ 2146F: include/linux/netfilter_bridge/