diff options
| -rw-r--r-- | CREDITS | 16 | ||||
| -rw-r--r-- | MAINTAINERS | 9 |
2 files changed, 25 insertions, 0 deletions
| @@ -1353,6 +1353,14 @@ S: Gen Stedmanstraat 212 | |||
| 1353 | S: 5623 HZ Eindhoven | 1353 | S: 5623 HZ Eindhoven |
| 1354 | S: The Netherlands | 1354 | S: The Netherlands |
| 1355 | 1355 | ||
| 1356 | N: Oliver Hartkopp | ||
| 1357 | E: oliver.hartkopp@volkswagen.de | ||
| 1358 | W: http://www.volkswagen.de | ||
| 1359 | D: Controller Area Network (network layer core) | ||
| 1360 | S: Brieffach 1776 | ||
| 1361 | S: 38436 Wolfsburg | ||
| 1362 | S: Germany | ||
| 1363 | |||
| 1356 | N: Andrew Haylett | 1364 | N: Andrew Haylett |
| 1357 | E: ajh@primag.co.uk | 1365 | E: ajh@primag.co.uk |
| 1358 | D: Selection mechanism | 1366 | D: Selection mechanism |
| @@ -3306,6 +3314,14 @@ S: Universit=E9 de Rennes I | |||
| 3306 | S: F-35042 Rennes Cedex | 3314 | S: F-35042 Rennes Cedex |
| 3307 | S: France | 3315 | S: France |
| 3308 | 3316 | ||
| 3317 | N: Urs Thuermann | ||
| 3318 | E: urs.thuermann@volkswagen.de | ||
| 3319 | W: http://www.volkswagen.de | ||
| 3320 | D: Controller Area Network (network layer core) | ||
| 3321 | S: Brieffach 1776 | ||
| 3322 | S: 38436 Wolfsburg | ||
| 3323 | S: Germany | ||
| 3324 | |||
| 3309 | N: Jon Tombs | 3325 | N: Jon Tombs |
| 3310 | E: jon@gte.esi.us.es | 3326 | E: jon@gte.esi.us.es |
| 3311 | W: http://www.esi.us.es/~jon | 3327 | W: http://www.esi.us.es/~jon |
diff --git a/MAINTAINERS b/MAINTAINERS index 29371226f682..6de909fe2013 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -982,6 +982,15 @@ M: corbet@lwn.net | |||
| 982 | L: video4linux-list@redhat.com | 982 | L: video4linux-list@redhat.com |
| 983 | S: Maintained | 983 | S: Maintained |
| 984 | 984 | ||
| 985 | CAN NETWORK LAYER | ||
| 986 | P: Urs Thuermann | ||
| 987 | M: urs.thuermann@volkswagen.de | ||
| 988 | P: Oliver Hartkopp | ||
| 989 | M: oliver.hartkopp@volkswagen.de | ||
| 990 | L: socketcan-core@lists.berlios.de | ||
| 991 | W: http://developer.berlios.de/projects/socketcan/ | ||
| 992 | S: Maintained | ||
| 993 | |||
| 985 | CALGARY x86-64 IOMMU | 994 | CALGARY x86-64 IOMMU |
| 986 | P: Muli Ben-Yehuda | 995 | P: Muli Ben-Yehuda |
| 987 | M: muli@il.ibm.com | 996 | M: muli@il.ibm.com |
