Automerge with /usr/src/ntfs-2.6.git.

1 files changed, 18 insertions, 6 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 4d44824884ef..a07eeb411370 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -304,7 +304,7 @@ S:	Maintained
 ARM/PT DIGITAL BOARD PORT
 P:      Stefan Eletzhofer
 M:      stefan.eletzhofer@eletztrick.de
-L:      linux-arm-kernel@lists.arm.linux.org.uk
+L:      linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 W:      http://www.arm.linux.org.uk/
 S:      Maintained
 
@@ -317,21 +317,21 @@ S:	Maintained
 ARM/STRONGARM110 PORT
 P:      Russell King
 M:      rmk@arm.linux.org.uk
-L:      linux-arm-kernel@lists.arm.linux.org.uk
+L:      linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 W:      http://www.arm.linux.org.uk/
 S:      Maintained
 
 ARM/S3C2410 ARM ARCHITECTURE
 P:      Ben Dooks
 M:      ben-s3c2410@fluff.org
-L:      linux-arm-kernel@lists.arm.linux.org.uk
+L:      linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 W:      http://www.fluff.org/ben/linux/
 S:      Maintained
 
 ARM/S3C2440 ARM ARCHITECTURE
 P:      Ben Dooks
 M:      ben-s3c2440@fluff.org
-L:      linux-arm-kernel@lists.arm.linux.org.uk
+L:      linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 W:      http://www.fluff.org/ben/linux/
 S:      Maintained
 
@@ -504,6 +504,13 @@ L:   bonding-devel@lists.sourceforge.net
 W:   http://sourceforge.net/projects/bonding/
 S:   Supported
 
+BROADBAND PROCESSOR ARCHITECTURE
+P:      Arnd Bergmann
+M:      arnd@arndb.de
+L:      linuxppc64-dev@ozlabs.org
+W:      http://linuxppc64.org
+S:      Supported
+
 BTTV VIDEO4LINUX DRIVER
 P:      Gerd Knorr
 M:      kraxel@bytesex.org
@@ -1853,7 +1860,7 @@ S:	Maintained
 PXA2xx SUPPORT
 P:      Nicolas Pitre
 M:      nico@cam.org
-L:      linux-arm-kernel@lists.arm.linux.org.uk
+L:      linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 S:      Maintained
 
 QLOGIC QLA2XXX FC-SCSI DRIVER
@@ -2138,6 +2145,11 @@ W:	http://tpmdd.sourceforge.net
 L:      tpmdd-devel@lists.sourceforge.net
 S:      Maintained
 
+TENSILICA XTENSA PORT (xtensa):
+P:      Chris Zankel
+M:      chris@zankel.net
+S:      Maintained
+
 UltraSPARC (sparc64):
 P:      David S. Miller
 M:      davem@davemloft.net
@@ -2155,7 +2167,7 @@ SHARP LH SUPPORT (LH7952X & LH7A40X)
 P:      Marc Singer
 M:      elf@buici.com
 W:      http://projects.buici.com/arm
-L:      linux-arm-kernel@lists.arm.linux.org.uk
+L:      linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 S:      Maintained
 
 SPARC (sparc32):