diff options
| -rw-r--r-- | MAINTAINERS | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 0e7a80aefa0c..e46566a9e3dc 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -1698,11 +1698,9 @@ F: arch/x86/include/asm/tce.h | |||
| 1698 | 1698 | ||
| 1699 | CAN NETWORK LAYER | 1699 | CAN NETWORK LAYER |
| 1700 | M: Oliver Hartkopp <socketcan@hartkopp.net> | 1700 | M: Oliver Hartkopp <socketcan@hartkopp.net> |
| 1701 | M: Oliver Hartkopp <oliver.hartkopp@volkswagen.de> | ||
| 1702 | M: Urs Thuermann <urs.thuermann@volkswagen.de> | ||
| 1703 | L: linux-can@vger.kernel.org | 1701 | L: linux-can@vger.kernel.org |
| 1704 | L: netdev@vger.kernel.org | 1702 | W: http://gitorious.org/linux-can |
| 1705 | W: http://developer.berlios.de/projects/socketcan/ | 1703 | T: git://gitorious.org/linux-can/linux-can-next.git |
| 1706 | S: Maintained | 1704 | S: Maintained |
| 1707 | F: net/can/ | 1705 | F: net/can/ |
| 1708 | F: include/linux/can.h | 1706 | F: include/linux/can.h |
| @@ -1713,9 +1711,10 @@ F: include/linux/can/gw.h | |||
| 1713 | 1711 | ||
| 1714 | CAN NETWORK DRIVERS | 1712 | CAN NETWORK DRIVERS |
| 1715 | M: Wolfgang Grandegger <wg@grandegger.com> | 1713 | M: Wolfgang Grandegger <wg@grandegger.com> |
| 1714 | M: Marc Kleine-Budde <mkl@pengutronix.de> | ||
| 1716 | L: linux-can@vger.kernel.org | 1715 | L: linux-can@vger.kernel.org |
| 1717 | L: netdev@vger.kernel.org | 1716 | W: http://gitorious.org/linux-can |
| 1718 | W: http://developer.berlios.de/projects/socketcan/ | 1717 | T: git://gitorious.org/linux-can/linux-can-next.git |
| 1719 | S: Maintained | 1718 | S: Maintained |
| 1720 | F: drivers/net/can/ | 1719 | F: drivers/net/can/ |
| 1721 | F: include/linux/can/dev.h | 1720 | F: include/linux/can/dev.h |