Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

1 files changed, 5 insertions, 6 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index dbf3d94b1ded..0cc83fc1d8b2 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1698,11 +1698,9 @@ F:	arch/x86/include/asm/tce.h
 
 CAN NETWORK LAYER
 M:      Oliver Hartkopp <socketcan@hartkopp.net>
-M:      Oliver Hartkopp <oliver.hartkopp@volkswagen.de>
-M:      Urs Thuermann <urs.thuermann@volkswagen.de>
 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 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 <wg@grandegger.com>
+M:      Marc Kleine-Budde <mkl@pengutronix.de>
 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 git://gitorious.org/linux-can/linux-can-next.git
 S:      Maintained
 F:      drivers/net/can/
 F:      include/linux/can/dev.h