iwlwifi: dump firmware build info in error case

[safe/jmp/linux-2.6] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index dad4f57..a43a105 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1372,20 +1372,30 @@ F:      arch/x86/include/asm/calgary.h
 F:     arch/x86/include/asm/tce.h
 
 CAN NETWORK LAYER
-M:     Urs Thuermann <urs.thuermann@volkswagen.de>
+M:     Oliver Hartkopp <socketcan@hartkopp.net>
 M:     Oliver Hartkopp <oliver.hartkopp@volkswagen.de>
-L:     socketcan-core@lists.berlios.de (subscribers-only)
+M:     Urs Thuermann <urs.thuermann@volkswagen.de>
+L:     socketcan-core@lists.berlios.de
+L:     netdev@vger.kernel.org
 W:     http://developer.berlios.de/projects/socketcan/
 S:     Maintained
-F:     drivers/net/can/
-F:     include/linux/can/
+F:     net/can/
 F:     include/linux/can.h
+F:     include/linux/can/core.h
+F:     include/linux/can/bcm.h
+F:     include/linux/can/raw.h
 
 CAN NETWORK DRIVERS
 M:     Wolfgang Grandegger <wg@grandegger.com>
-L:     socketcan-core@lists.berlios.de (subscribers-only)
+L:     socketcan-core@lists.berlios.de
+L:     netdev@vger.kernel.org
 W:     http://developer.berlios.de/projects/socketcan/
 S:     Maintained
+F:     drivers/net/can/
+F:     include/linux/can/dev.h
+F:     include/linux/can/error.h
+F:     include/linux/can/netlink.h
+F:     include/linux/can/platform/
 
 CELL BROADBAND ENGINE ARCHITECTURE
 M:     Arnd Bergmann <arnd@arndb.de>
@@ -3872,6 +3882,7 @@ F:        net/rfkill/
 F:     net/wireless/
 F:     include/net/ieee80211*
 F:     include/linux/wireless.h
+F:     include/linux/iw_handler.h
 F:     drivers/net/wireless/
 
 NETWORKING DRIVERS