diff --git a/CREDITS b/CREDITS index ee909f2cc49e54f0799a4739d24c4cb9151ae453..edff310dbe531a6f9c2da88578c605f099e79bfc 100644 --- a/CREDITS +++ b/CREDITS @@ -1353,6 +1353,14 @@ S: Gen Stedmanstraat 212 S: 5623 HZ Eindhoven S: The Netherlands +N: Oliver Hartkopp +E: oliver.hartkopp@volkswagen.de +W: http://www.volkswagen.de +D: Controller Area Network (network layer core) +S: Brieffach 1776 +S: 38436 Wolfsburg +S: Germany + N: Andrew Haylett E: ajh@primag.co.uk D: Selection mechanism @@ -3306,6 +3314,14 @@ S: Universit=E9 de Rennes I S: F-35042 Rennes Cedex S: France +N: Urs Thuermann +E: urs.thuermann@volkswagen.de +W: http://www.volkswagen.de +D: Controller Area Network (network layer core) +S: Brieffach 1776 +S: 38436 Wolfsburg +S: Germany + N: Jon Tombs E: jon@gte.esi.us.es W: http://www.esi.us.es/~jon diff --git a/MAINTAINERS b/MAINTAINERS index 29371226f682d1967126ac9d866c1661d6caf3ff..6de909fe2013e432d28f17d84a4228930c55c9a5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -982,6 +982,15 @@ M: corbet@lwn.net L: video4linux-list@redhat.com S: Maintained +CAN NETWORK LAYER +P: Urs Thuermann +M: urs.thuermann@volkswagen.de +P: Oliver Hartkopp +M: oliver.hartkopp@volkswagen.de +L: socketcan-core@lists.berlios.de +W: http://developer.berlios.de/projects/socketcan/ +S: Maintained + CALGARY x86-64 IOMMU P: Muli Ben-Yehuda M: muli@il.ibm.com