diff options
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index fe88b5f732cd..47cc449d89d8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -1405,20 +1405,30 @@ F: arch/x86/include/asm/calgary.h | |||
| 1405 | F: arch/x86/include/asm/tce.h | 1405 | F: arch/x86/include/asm/tce.h |
| 1406 | 1406 | ||
| 1407 | CAN NETWORK LAYER | 1407 | CAN NETWORK LAYER |
| 1408 | M: Urs Thuermann <urs.thuermann@volkswagen.de> | 1408 | M: Oliver Hartkopp <socketcan@hartkopp.net> |
| 1409 | M: Oliver Hartkopp <oliver.hartkopp@volkswagen.de> | 1409 | M: Oliver Hartkopp <oliver.hartkopp@volkswagen.de> |
| 1410 | L: socketcan-core@lists.berlios.de (subscribers-only) | 1410 | M: Urs Thuermann <urs.thuermann@volkswagen.de> |
| 1411 | L: socketcan-core@lists.berlios.de | ||
| 1412 | L: netdev@vger.kernel.org | ||
| 1411 | W: http://developer.berlios.de/projects/socketcan/ | 1413 | W: http://developer.berlios.de/projects/socketcan/ |
| 1412 | S: Maintained | 1414 | S: Maintained |
| 1413 | F: drivers/net/can/ | 1415 | F: net/can/ |
| 1414 | F: include/linux/can/ | ||
| 1415 | F: include/linux/can.h | 1416 | F: include/linux/can.h |
| 1417 | F: include/linux/can/core.h | ||
| 1418 | F: include/linux/can/bcm.h | ||
| 1419 | F: include/linux/can/raw.h | ||
| 1416 | 1420 | ||
| 1417 | CAN NETWORK DRIVERS | 1421 | CAN NETWORK DRIVERS |
| 1418 | M: Wolfgang Grandegger <wg@grandegger.com> | 1422 | M: Wolfgang Grandegger <wg@grandegger.com> |
| 1419 | L: socketcan-core@lists.berlios.de (subscribers-only) | 1423 | L: socketcan-core@lists.berlios.de |
| 1424 | L: netdev@vger.kernel.org | ||
| 1420 | W: http://developer.berlios.de/projects/socketcan/ | 1425 | W: http://developer.berlios.de/projects/socketcan/ |
| 1421 | S: Maintained | 1426 | S: Maintained |
| 1427 | F: drivers/net/can/ | ||
| 1428 | F: include/linux/can/dev.h | ||
| 1429 | F: include/linux/can/error.h | ||
| 1430 | F: include/linux/can/netlink.h | ||
| 1431 | F: include/linux/can/platform/ | ||
| 1422 | 1432 | ||
| 1423 | CELL BROADBAND ENGINE ARCHITECTURE | 1433 | CELL BROADBAND ENGINE ARCHITECTURE |
| 1424 | M: Arnd Bergmann <arnd@arndb.de> | 1434 | M: Arnd Bergmann <arnd@arndb.de> |
| @@ -2130,6 +2140,7 @@ F: drivers/net/eexpress.* | |||
| 2130 | ETHERNET BRIDGE | 2140 | ETHERNET BRIDGE |
| 2131 | M: Stephen Hemminger <shemminger@linux-foundation.org> | 2141 | M: Stephen Hemminger <shemminger@linux-foundation.org> |
| 2132 | L: bridge@lists.linux-foundation.org | 2142 | L: bridge@lists.linux-foundation.org |
| 2143 | L: netdev@vger.kernel.org | ||
| 2133 | W: http://www.linux-foundation.org/en/Net:Bridge | 2144 | W: http://www.linux-foundation.org/en/Net:Bridge |
| 2134 | S: Maintained | 2145 | S: Maintained |
| 2135 | F: include/linux/netfilter_bridge/ | 2146 | F: include/linux/netfilter_bridge/ |
| @@ -4316,6 +4327,7 @@ PERFORMANCE EVENTS SUBSYSTEM | |||
| 4316 | M: Peter Zijlstra <a.p.zijlstra@chello.nl> | 4327 | M: Peter Zijlstra <a.p.zijlstra@chello.nl> |
| 4317 | M: Paul Mackerras <paulus@samba.org> | 4328 | M: Paul Mackerras <paulus@samba.org> |
| 4318 | M: Ingo Molnar <mingo@elte.hu> | 4329 | M: Ingo Molnar <mingo@elte.hu> |
| 4330 | M: Arnaldo Carvalho de Melo <acme@redhat.com> | ||
| 4319 | S: Supported | 4331 | S: Supported |
| 4320 | F: kernel/perf_event.c | 4332 | F: kernel/perf_event.c |
| 4321 | F: include/linux/perf_event.h | 4333 | F: include/linux/perf_event.h |
