aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWolfgang Grandegger <wg@grandegger.com>2009-05-15 19:39:28 -0400
committerDavid S. Miller <davem@davemloft.net>2009-05-18 18:41:40 -0400
commit4261a2043f1bed16f226c507ea37015090600c0f (patch)
treef4f60be750939a869047355f4878a4bb3782b0f7
parente20dad964aeac229a204e298c563b6ea7ff1e987 (diff)
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
1253S: Sterling Heights, Michigan 48313 1253S: Sterling Heights, Michigan 48313
1254S: USA 1254S: USA
1255 1255
1256N: Wolfgang Grandegger
1257E: wg@grandegger.com
1258D: Controller Area Network (device drivers)
1259
1256N: William Greathouse 1260N: William Greathouse
1257E: wgreathouse@smva.com 1261E: wgreathouse@smva.com
1258E: wgreathouse@myfavoritei.com 1262E: 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/
1278F: include/linux/can/ 1278F: include/linux/can/
1279F: include/linux/can.h 1279F: include/linux/can.h
1280 1280
1281CAN NETWORK DRIVERS
1282P: Wolfgang Grandegger
1283M: wg@grandegger.com
1284L: socketcan-core@lists.berlios.de (subscribers-only)
1285W: http://developer.berlios.de/projects/socketcan/
1286S: Maintained
1287
1281CELL BROADBAND ENGINE ARCHITECTURE 1288CELL BROADBAND ENGINE ARCHITECTURE
1282P: Arnd Bergmann 1289P: Arnd Bergmann
1283M: arnd@arndb.de 1290M: arnd@arndb.de