From beb9cb2fa36101fd22bcb4392752f2a8d508dde0 Mon Sep 17 00:00:00 2001 From: Oliver Hartkopp Date: Sat, 6 Mar 2010 08:31:50 +0000 Subject: [PATCH] --- yaml --- r: 187956 b: refs/heads/master c: 8d15d3864a733476931f7e0b3d82824cddc766c2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/MAINTAINERS | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 3c75a831c9fa..2c6b3fd2d091 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e7111eac8ebda724d1e4d9e6aaf4569744a584d5 +refs/heads/master: 8d15d3864a733476931f7e0b3d82824cddc766c2 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index dad4f575bc1f..66418dd6309c 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -1372,20 +1372,28 @@ F: arch/x86/include/asm/calgary.h F: arch/x86/include/asm/tce.h CAN NETWORK LAYER -M: Urs Thuermann +M: Oliver Hartkopp M: Oliver Hartkopp -L: socketcan-core@lists.berlios.de (subscribers-only) +M: Urs Thuermann +L: socketcan-core@lists.berlios.de W: http://developer.berlios.de/projects/socketcan/ S: Maintained -F: drivers/net/can/ -F: include/linux/can/ +F: net/can/ F: include/linux/can.h +F: include/linux/can/core.h +F: include/linux/can/bcm.h +F: include/linux/can/raw.h CAN NETWORK DRIVERS M: Wolfgang Grandegger -L: socketcan-core@lists.berlios.de (subscribers-only) +L: socketcan-core@lists.berlios.de W: http://developer.berlios.de/projects/socketcan/ S: Maintained +F: drivers/net/can/ +F: include/linux/can/dev.h +F: include/linux/can/error.h +F: include/linux/can/netlink.h +F: include/linux/can/platform/ CELL BROADBAND ENGINE ARCHITECTURE M: Arnd Bergmann