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