2 files changed, 130 insertions, 3 deletions

diff --git a/CREDITS b/CREDITS
index 8218e790f43d..75c5ce82720c 100644
--- a/CREDITS
+++ b/CREDITS
@@ -516,9 +516,10 @@ S: Orlando, Florida
 S: USA
 
 N: Lennert Buytenhek
-E: buytenh@gnu.org
-D: Rewrite of the ethernet bridging code
-S: Ravenhorst 58B
+E: kernel@wantstofly.org
+D: Original (2.4) rewrite of the ethernet bridging code
+D: Various ARM bits and pieces
+S: Ravenhorst 58
 S: 2317 AK Leiden
 S: The Netherlands
 
diff --git a/MAINTAINERS b/MAINTAINERS
index 6b8788ee78c4..d5a97d3e23c3 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -355,6 +355,24 @@ P:	Ian Molton
 M:      spyro@f2s.com
 S:      Maintained
 
+ARM/ADI ROADRUNNER MACHINE SUPPORT
+P:      Lennert Buytenhek
+M:      kernel@wantstofly.org
+L:      linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+S:      Maintained
+
+ARM/ADS SPHERE MACHINE SUPPORT
+P:      Lennert Buytenhek
+M:      kernel@wantstofly.org
+L:      linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+S:      Maintained
+
+ARM/AJECO 1ARM MACHINE SUPPORT
+P:      Lennert Buytenhek
+M:      kernel@wantstofly.org
+L:      linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+S:      Maintained
+
 ARM/ATMEL AT91RM9200 ARM ARCHITECTURE
 P:      Andrew Victor
 M:      andrew@sanpeople.com
@@ -362,17 +380,89 @@ L:      linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 W:      http://maxim.org.za/at91_26.html
 S:      Maintained
 
+ARM/CIRRUS LOGIC EP93XX ARM ARCHITECTURE
+P:      Lennert Buytenhek
+M:      kernel@wantstofly.org
+L:      linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+S:      Maintained
+
+ARM/CIRRUS LOGIC EDB9315A MACHINE SUPPORT
+P:      Lennert Buytenhek
+M:      kernel@wantstofly.org
+L:      linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+S:      Maintained
+
 ARM/CORGI MACHINE SUPPORT
 P:      Richard Purdie
 M:      rpurdie@rpsys.net
 S:      Maintained
 
+ARM/GLOMATION GESBC9312SX MACHINE SUPPORT
+P:      Lennert Buytenhek
+M:      kernel@wantstofly.org
+L:      linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+S:      Maintained
+
 ARM/HP JORNADA 7XX MACHINE SUPPORT
 P:      Kristoffer Ericson
 M:      kristoffer_e1@hotmail.com
 W:      www.jlime.com
 S:      Maintained
 
+ARM/INTEL IOP32X ARM ARCHITECTURE
+P:      Lennert Buytenhek
+M:      kernel@wantstofly.org
+L:      linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+S:      Maintained
+
+ARM/INTEL IOP13XX ARM ARCHITECTURE
+P:      Lennert Buytenhek
+M:      kernel@wantstofly.org
+L:      linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+S:      Maintained
+
+ARM/INTEL IQ81342EX MACHINE SUPPORT
+P:      Lennert Buytenhek
+M:      kernel@wantstofly.org
+L:      linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+S:      Maintained
+
+ARM/INTEL IXP2000 ARM ARCHITECTURE
+P:      Lennert Buytenhek
+M:      kernel@wantstofly.org
+L:      linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+S:      Maintained
+
+ARM/INTEL IXDP2850 MACHINE SUPPORT
+P:      Lennert Buytenhek
+M:      kernel@wantstofly.org
+L:      linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+S:      Maintained
+
+ARM/INTEL IXP23XX ARM ARCHITECTURE
+P:      Lennert Buytenhek
+M:      kernel@wantstofly.org
+L:      linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+S:      Maintained
+
+ARM/INTEL XSC3 (MANZANO) ARM CORE
+P:      Lennert Buytenhek
+M:      kernel@wantstofly.org
+L:      linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+S:      Maintained
+
+ARM/IP FABRICS DOUBLE ESPRESSO MACHINE SUPPORT
+P:      Lennert Buytenhek
+M:      kernel@wantstofly.org
+L:      linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+S:      Maintained
+
+ARM/LOGICPD PXA270 MACHINE SUPPORT
+P:      Lennert Buytenhek
+M:      kernel@wantstofly.org
+L:      linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+S:      Maintained
+
 ARM/TOSA MACHINE SUPPORT
 P:      Dirk Opfer
 M:      dirk@opfer-online.de
@@ -391,6 +481,12 @@ L:	linux-arm-kernel@lists.arm.linux.org.uk	(subscribers-only)
 W:      http://www.arm.linux.org.uk/
 S:      Maintained
 
+ARM/RADISYS ENP2611 MACHINE SUPPORT
+P:      Lennert Buytenhek
+M:      kernel@wantstofly.org
+L:      linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+S:      Maintained
+
 ARM/SHARK MACHINE SUPPORT
 P:      Alexander Schulz
 M:      alex@shark-linux.de
@@ -418,6 +514,18 @@ L:	linux-arm-kernel@lists.arm.linux.org.uk	(subscribers-only)
 W:      http://www.fluff.org/ben/linux/
 S:      Maintained
 
+ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT
+P:      Lennert Buytenhek
+M:      kernel@wantstofly.org
+L:      linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+S:      Maintained
+
+ARM/THECUS N2100 MACHINE SUPPORT
+P:      Lennert Buytenhek
+M:      kernel@wantstofly.org
+L:      linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+S:      Maintained
+
 ARPD SUPPORT
 P:      Jonathan Layes
 L:      netdev@vger.kernel.org
@@ -688,12 +796,24 @@ M:	joel.becker@oracle.com
 L:      linux-kernel@vger.kernel.org
 S:      Supported
 
+CIRRUS LOGIC EP93XX ETHERNET DRIVER
+P:      Lennert Buytenhek
+M:      kernel@wantstofly.org
+L:      netdev@vger.kernel.org
+S:      Maintained
+
 CIRRUS LOGIC GENERIC FBDEV DRIVER
 P:      Jeff Garzik
 M:      jgarzik@pobox.com
 L:      linux-fbdev-devel@lists.sourceforge.net (subscribers-only)
 S:      Odd Fixes
 
+CIRRUS LOGIC EP93XX OHCI USB HOST DRIVER
+P:      Lennert Buytenhek
+M:      kernel@wantstofly.org
+L:      linux-usb-devel@lists.sourceforge.net
+S:      Maintained
+
 CIRRUS LOGIC CS4280/CS461x SOUNDDRIVER
 P:      Cirrus Logic Corporation (kernel 2.2 driver)
 M:      Cirrus Logic Corporation, Thomas Woller <twoller@crystal.cirrus.com>
@@ -1563,6 +1683,12 @@ P:	Deepak Saxena
 M:      dsaxena@plexity.net
 S:      Maintained
 
+INTEL IXP2000 ETHERNET DRIVER
+P:      Lennert Buytenhek
+M:      kernel@wantstofly.org
+L:      netdev@vger.kernel.org
+S:      Maintained
+
 INTEL PRO/100 ETHERNET SUPPORT
 P:      John Ronciak
 M:      john.ronciak@intel.com