diff --git a/[refs] b/[refs]
index bd4915bda170..b243fc02b418 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e20dad964aeac229a204e298c563b6ea7ff1e987
+refs/heads/master: 4261a2043f1bed16f226c507ea37015090600c0f
diff --git a/trunk/CREDITS b/trunk/CREDITS
index 2520ba620ff1..2b88fb37ad50 100644
--- a/trunk/CREDITS
+++ b/trunk/CREDITS
@@ -1253,6 +1253,10 @@ S: 8124 Constitution Apt. 7
 S: Sterling Heights, Michigan 48313
 S: USA
 
+N: Wolfgang Grandegger
+E: wg@grandegger.com
+D: Controller Area Network (device drivers)
+
 N: William Greathouse
 E: wgreathouse@smva.com
 E: wgreathouse@myfavoritei.com
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
index 3dfe1a7c9a93..b5160a21c490 100644
--- a/trunk/MAINTAINERS
+++ b/trunk/MAINTAINERS
@@ -1278,6 +1278,13 @@ F:	drivers/net/can/
 F:	include/linux/can/
 F:	include/linux/can.h
 
+CAN NETWORK DRIVERS
+P:	Wolfgang Grandegger
+M:	wg@grandegger.com
+L:	socketcan-core@lists.berlios.de (subscribers-only)
+W:	http://developer.berlios.de/projects/socketcan/
+S:	Maintained
+
 CELL BROADBAND ENGINE ARCHITECTURE
 P:	Arnd Bergmann
 M:	arnd@arndb.de