summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Grandegger <wg@grandegger.com>2009-05-16 03:39:28 +0400
committerDavid S. Miller <davem@davemloft.net>2009-05-19 02:41:40 +0400
commit4261a2043f1bed16f226c507ea37015090600c0f (patch)
treef4f60be750939a869047355f4878a4bb3782b0f7
parente20dad964aeac229a204e298c563b6ea7ff1e987 (diff)
downloadlinux-4261a2043f1bed16f226c507ea37015090600c0f.tar.xz
can: Update MAINTAINERS and CREDITS file
Signed-off-by: Wolfgang Grandegger <wg@grandegger.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--CREDITS4
-rw-r--r--MAINTAINERS7
2 files changed, 11 insertions, 0 deletions
diff --git a/CREDITS b/CREDITS
index 2520ba620ff1..2b88fb37ad50 100644
--- a/CREDITS
+++ b/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/MAINTAINERS b/MAINTAINERS
index 3dfe1a7c9a93..b5160a21c490 100644
--- a/MAINTAINERS
+++ b/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