From e21a7aea76249534a2576917cad75a25e25669cb Mon Sep 17 00:00:00 2001 From: Oliver Hartkopp Date: Tue, 3 Jan 2012 08:40:28 +0000 Subject: [PATCH] --- yaml --- r: 277105 b: refs/heads/master c: ec78213acd6de3e9fa83c78b1046ebbe1d0ca8bf h: refs/heads/master i: 277103: 16b51817aa785d0234d1d65f97cb97a807d5c64b v: v3 --- [refs] | 2 +- trunk/MAINTAINERS | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index eb3b2b409a61..91c4ded12529 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0d9032477f4ba2323079466efef0c1419613eebf +refs/heads/master: ec78213acd6de3e9fa83c78b1046ebbe1d0ca8bf diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 0e7a80aefa0c..e46566a9e3dc 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -1698,11 +1698,9 @@ F: arch/x86/include/asm/tce.h CAN NETWORK LAYER M: Oliver Hartkopp -M: Oliver Hartkopp -M: Urs Thuermann L: linux-can@vger.kernel.org -L: netdev@vger.kernel.org -W: http://developer.berlios.de/projects/socketcan/ +W: http://gitorious.org/linux-can +T: git://gitorious.org/linux-can/linux-can-next.git S: Maintained F: net/can/ F: include/linux/can.h @@ -1713,9 +1711,10 @@ F: include/linux/can/gw.h CAN NETWORK DRIVERS M: Wolfgang Grandegger +M: Marc Kleine-Budde L: linux-can@vger.kernel.org -L: netdev@vger.kernel.org -W: http://developer.berlios.de/projects/socketcan/ +W: http://gitorious.org/linux-can +T: git://gitorious.org/linux-can/linux-can-next.git S: Maintained F: drivers/net/can/ F: include/linux/can/dev.h