[SCSI] Merge up to linux-2.6 head

Conflicts:

	drivers/scsi/jazz_esp.c

Same changes made by both SCSI and SPARC trees: problem with UTF-8
conversion in the copyright.

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

1 files changed, 35 insertions, 6 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index bbeb5b6b5b05..4cc17b993b6a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -332,6 +332,9 @@ L:	linux-usb-devel@lists.sourceforge.net
 W:      http://www.linux-usb.org/SpeedTouch/
 S:      Maintained
 
+ALCHEMY AU1XX0 MMC DRIVER
+S:      Orphan
+
 ALI1563 I2C DRIVER
 P:      Rudolf Marek
 M:      r.marek@assembler.cz
@@ -418,6 +421,12 @@ P:	Ian Molton
 M:      spyro@f2s.com
 S:      Maintained
 
+ARM PRIMECELL MMCI PL180/1 DRIVER
+P:      Russell King
+M:      rmk@arm.linux.org.uk
+L:      linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+S:      Maintained
+
 ARM/ADI ROADRUNNER MACHINE SUPPORT
 P:      Lennert Buytenhek
 M:      kernel@wantstofly.org
@@ -649,6 +658,9 @@ L:	linux-atm-general@lists.sourceforge.net (subscribers-only)
 W:      http://linux-atm.sourceforge.net
 S:      Maintained
 
+ATMEL AT91 MCI DRIVER
+S:      Orphan
+
 ATMEL MACB ETHERNET DRIVER
 P:      Haavard Skinnemoen
 M:      hskinnemoen@atmel.com
@@ -2231,11 +2243,11 @@ M:	khali@linux-fr.org
 L:      lm-sensors@lm-sensors.org
 S:      Maintained
 
-LOGICAL DISK MANAGER SUPPORT (LDM, Windows 2000/XP Dynamic Disks)
+LOGICAL DISK MANAGER SUPPORT (LDM, Windows 2000/XP/Vista Dynamic Disks)
 P:      Richard Russon (FlatCap)
 M:      ldm@flatcap.org
-L:      ldm-devel@lists.sourceforge.net
-W:      http://ldm.sourceforge.net
+L:      linux-ntfs-dev@lists.sourceforge.net
+W:      http://www.linux-ntfs.org/content/view/19/37/
 S:      Maintained
 
 LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI)
@@ -2322,7 +2334,7 @@ S:	Maintained
 
 MEGARAID SCSI DRIVERS
 P:      Neela Syam Kolli
-M:      Neela.Kolli@engenio.com
+M:      megaraidlinux@lsi.com
 S:      linux-scsi@vger.kernel.org
 W:      http://megaraid.lsilogic.com
 S:      Maintained
@@ -2380,6 +2392,13 @@ M:	stelian@popies.net
 W:      http://popies.net/meye/
 S:      Maintained
 
+MOTOROLA IMX MMC/SD HOST CONTROLLER INTERFACE DRIVER
+P:      Pavel Pisa
+M:      ppisa@pikron.com
+L:      linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+W:      http://mmc.drzeus.cx/wiki/Controllers/Freescale/SDHC
+S:      Maintained
+
 MOUSE AND MISC DEVICES [GENERAL]
 P:      Alessandro Rubini
 M:      rubini@ipvvis.unipv.it
@@ -2689,13 +2708,13 @@ L:	i2c@lm-sensors.org
 S:      Maintained
 
 PARALLEL PORT SUPPORT
-L:      linux-parport@lists.infradead.org
+L:      linux-parport@lists.infradead.org (subscribers-only)
 S:      Orphan
 
 PARIDE DRIVERS FOR PARALLEL PORT IDE DEVICES
 P:      Tim Waugh
 M:      tim@cyberelk.net
-L:      linux-parport@lists.infradead.org
+L:      linux-parport@lists.infradead.org (subscribers-only)
 W:      http://www.torque.net/linux-pp.html
 S:      Maintained
 
@@ -2900,6 +2919,9 @@ M:	nico@cam.org
 L:      linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 S:      Maintained
 
+PXA MMCI DRIVER
+S:      Orphan
+
 QLOGIC QLA2XXX FC-SCSI DRIVER
 P:      Andrew Vasquez
 M:      linux-driver@qlogic.com
@@ -3416,6 +3438,13 @@ P:      Alex Dubov
 M:      oakad@yahoo.com
 S:      Maintained
 
+TI OMAP MMC INTERFACE DRIVER
+P:      Carlos Aguiar, Anderson Briglia and Syed Khasim
+M:      linux-omap-open-source@linux.omap.com 
+W:      http://linux.omap.com
+W:      http://www.muru.com/linux/omap/
+S:      Maintained
+
 TI OMAP RANDOM NUMBER GENERATOR SUPPORT
 P:      Deepak Saxena
 M:      dsaxena@plexity.net