1 files changed, 22 insertions, 8 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 5a70c1809b76..4babed7836c7 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1691,11 +1691,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
@@ -1706,9 +1704,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
@@ -4005,7 +4004,7 @@ M:	Josh Boyer <jwboyer@gmail.com>
 M:      Matt Porter <mporter@kernel.crashing.org>
 W:      http://www.penguinppc.org/
 L:      linuxppc-dev@lists.ozlabs.org
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git
+T:      git git://git.infradead.org/users/jwboyer/powerpc-4xx.git
 S:      Maintained
 F:      arch/powerpc/platforms/40x/
 F:      arch/powerpc/platforms/44x/
@@ -4848,6 +4847,14 @@ S:	Maintained
 T:      git git://openrisc.net/~jonas/linux
 F:      arch/openrisc
 
+OPENVSWITCH
+M:      Jesse Gross <jesse@nicira.com>
+L:      dev@openvswitch.org
+W:      http://openvswitch.org
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch.git
+S:      Maintained
+F:      net/openvswitch/
+
 OPL4 DRIVER
 M:      Clemens Ladisch <clemens@ladisch.de>
 L:      alsa-devel@alsa-project.org (moderated for non-subscribers)
@@ -5367,6 +5374,7 @@ S:	Supported
 F:      drivers/scsi/qla4xxx/
 
 QLOGIC QLA3XXX NETWORK DRIVER
+M:      Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
 M:      Ron Mercer <ron.mercer@qlogic.com>
 M:      linux-driver@qlogic.com
 L:      netdev@vger.kernel.org
@@ -5886,7 +5894,6 @@ F:	drivers/net/ethernet/emulex/benet/
 
 SFC NETWORK DRIVER
 M:      Solarflare linux maintainers <linux-net-drivers@solarflare.com>
-M:      Steve Hodgson <shodgson@solarflare.com>
 M:      Ben Hutchings <bhutchings@solarflare.com>
 L:      netdev@vger.kernel.org
 S:      Supported
@@ -6494,6 +6501,13 @@ W:	http://tcp-lp-mod.sourceforge.net/
 S:      Maintained
 F:      net/ipv4/tcp_lp.c
 
+TEAM DRIVER
+M:      Jiri Pirko <jpirko@redhat.com>
+L:      netdev@vger.kernel.org
+S:      Supported
+F:      drivers/net/team/
+F:      include/linux/if_team.h
+
 TEGRA SUPPORT
 M:      Colin Cross <ccross@android.com>
 M:      Olof Johansson <olof@lixom.net>