diff options
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 1b9bcdaef6f..ae563fad227 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -1392,7 +1392,6 @@ F: include/linux/backlight.h | |||
1392 | BATMAN ADVANCED | 1392 | BATMAN ADVANCED |
1393 | M: Marek Lindner <lindner_marek@yahoo.de> | 1393 | M: Marek Lindner <lindner_marek@yahoo.de> |
1394 | M: Simon Wunderlich <siwu@hrz.tu-chemnitz.de> | 1394 | M: Simon Wunderlich <siwu@hrz.tu-chemnitz.de> |
1395 | M: Sven Eckelmann <sven@narfation.org> | ||
1396 | L: b.a.t.m.a.n@lists.open-mesh.org | 1395 | L: b.a.t.m.a.n@lists.open-mesh.org |
1397 | W: http://www.open-mesh.org/ | 1396 | W: http://www.open-mesh.org/ |
1398 | S: Maintained | 1397 | S: Maintained |
@@ -1425,7 +1424,6 @@ S: Supported | |||
1425 | F: arch/blackfin/ | 1424 | F: arch/blackfin/ |
1426 | 1425 | ||
1427 | BLACKFIN EMAC DRIVER | 1426 | BLACKFIN EMAC DRIVER |
1428 | M: Michael Hennerich <michael.hennerich@analog.com> | ||
1429 | L: uclinux-dist-devel@blackfin.uclinux.org | 1427 | L: uclinux-dist-devel@blackfin.uclinux.org |
1430 | W: http://blackfin.uclinux.org | 1428 | W: http://blackfin.uclinux.org |
1431 | S: Supported | 1429 | S: Supported |
@@ -1641,7 +1639,7 @@ CAN NETWORK LAYER | |||
1641 | M: Oliver Hartkopp <socketcan@hartkopp.net> | 1639 | M: Oliver Hartkopp <socketcan@hartkopp.net> |
1642 | M: Oliver Hartkopp <oliver.hartkopp@volkswagen.de> | 1640 | M: Oliver Hartkopp <oliver.hartkopp@volkswagen.de> |
1643 | M: Urs Thuermann <urs.thuermann@volkswagen.de> | 1641 | M: Urs Thuermann <urs.thuermann@volkswagen.de> |
1644 | L: socketcan-core@lists.berlios.de | 1642 | L: socketcan-core@lists.berlios.de (subscribers-only) |
1645 | L: netdev@vger.kernel.org | 1643 | L: netdev@vger.kernel.org |
1646 | W: http://developer.berlios.de/projects/socketcan/ | 1644 | W: http://developer.berlios.de/projects/socketcan/ |
1647 | S: Maintained | 1645 | S: Maintained |
@@ -1653,7 +1651,7 @@ F: include/linux/can/raw.h | |||
1653 | 1651 | ||
1654 | CAN NETWORK DRIVERS | 1652 | CAN NETWORK DRIVERS |
1655 | M: Wolfgang Grandegger <wg@grandegger.com> | 1653 | M: Wolfgang Grandegger <wg@grandegger.com> |
1656 | L: socketcan-core@lists.berlios.de | 1654 | L: socketcan-core@lists.berlios.de (subscribers-only) |
1657 | L: netdev@vger.kernel.org | 1655 | L: netdev@vger.kernel.org |
1658 | W: http://developer.berlios.de/projects/socketcan/ | 1656 | W: http://developer.berlios.de/projects/socketcan/ |
1659 | S: Maintained | 1657 | S: Maintained |
@@ -5183,6 +5181,7 @@ S: Supported | |||
5183 | F: drivers/net/qlcnic/ | 5181 | F: drivers/net/qlcnic/ |
5184 | 5182 | ||
5185 | QLOGIC QLGE 10Gb ETHERNET DRIVER | 5183 | QLOGIC QLGE 10Gb ETHERNET DRIVER |
5184 | M: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com> | ||
5186 | M: Ron Mercer <ron.mercer@qlogic.com> | 5185 | M: Ron Mercer <ron.mercer@qlogic.com> |
5187 | M: linux-driver@qlogic.com | 5186 | M: linux-driver@qlogic.com |
5188 | L: netdev@vger.kernel.org | 5187 | L: netdev@vger.kernel.org |