Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
  [SCSI] megaraid_sas: intercept cmd timeout and throttle io
  [SCSI] fusion: Fix |/|| confusion
  [SCSI] aic94xx: asd_clear_nexus should fail if the cleared task does not complete
  [SCSI] aic7xxx: fix aicasm build failure with gcc-3.4.6
  [SCSI] aacraid: apply commit config for reset_devices flag
  [SCSI] sd: fix refcounting regression in suspend/resume routines
  [SCSI] aacraid: fix panic on short Inquiry
  [SCSI] aacraid: Correct sa platform support. (Was: [Bug 8469] Bad EIP value on pentium3 SMP kernel-2.6.21.1)
  [SCSI] NCR53C9x: correct spelling mistake in deprecation notice
  [SCSI] tgt: fix a rdma indirect transfer error bug
  [SCSI] MegaRAID: Update MAINTAINERS email-id
  [SCSI] stex: minor cleanup and version update
  [SCSI] stex: fix reset recovery for console device
  [SCSI] stex: extend hard reset wait time
  [SCSI] stex: fix id mapping issue
  [SCSI] ipr: Proper return codes for eh_dev_reset for SATA devices
  [SCSI] zfcp: IO stall after deleting and path checker changes after reenabling zfcp devices
  [SCSI] zfcp: avoid clutter in erp_dbf

diff --combined Documentation/feature-removal-schedule.txt
index 5c8695a,adc84d5..2d7ea85
--- 1/Documentation/feature-removal-schedule.txt
--- 2/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@@ -62,7 -62,7 +62,7 @@@ Who:  Dan Dennedy <dan@dennedy.org>, Ste
  What: old NCR53C9x driver
  When: October 2007
  Why:  Replaced by the much better esp_scsi driver.  Actual low-level
-       driver can ported over almost trivially.
+       driver can be ported over almost trivially.
  Who:  David Miller <davem@davemloft.net>
        Christoph Hellwig <hch@lst.de>
  
@@@ -328,20 -328,21 +328,20 @@@ Who:   Adrian Bunk <bunk@stusta.de
  
  ---------------------------
  
 -What: libata.spindown_compat module parameter
 +What: libata spindown skipping and warning
  When: Dec 2008
 -Why:  halt(8) synchronizes caches for and spins down libata disks
 -      because libata didn't use to spin down disk on system halt
 -      (only synchronized caches).
 -      Spin down on system halt is now implemented and can be tested
 -      using sysfs node /sys/class/scsi_disk/h:c:i:l/manage_start_stop.
 +Why:  Some halt(8) implementations synchronize caches for and spin
 +      down libata disks because libata didn't use to spin down disk on
 +      system halt (only synchronized caches).
 +      Spin down on system halt is now implemented.  sysfs node
 +      /sys/class/scsi_disk/h:c:i:l/manage_start_stop is present if
 +      spin down support is available.
        Because issuing spin down command to an already spun down disk
 -      makes some disks spin up just to spin down again, the old
 -      behavior needs to be maintained till userspace tool is updated
 -      to check the sysfs node and not to spin down disks with the
 -      node set to one.
 -      This module parameter is to give userspace tool the time to
 -      get updated and should be removed after userspace is
 -      reasonably updated.
 +      makes some disks spin up just to spin down again, libata tracks
 +      device spindown status to skip the extra spindown command and
 +      warn about it.
 +      This is to give userspace tools the time to get updated and will
 +      be removed after userspace is reasonably updated.
  Who:  Tejun Heo <htejun@gmail.com>
  
  ---------------------------

diff --combined MAINTAINERS
index 953291d,f6b89df..4cc17b9
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -332,9 -332,6 +332,9 @@@ L: linux-usb-devel@lists.sourceforge.ne
  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
@@@ -421,12 -418,6 +421,12 @@@ P:       Ian Molto
  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
@@@ -658,9 -649,6 +658,9 @@@ L: linux-atm-general@lists.sourceforge.
  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
@@@ -2243,11 -2231,11 +2243,11 @@@ M:   khali@linux-fr.or
  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)
@@@ -2334,7 -2322,7 +2334,7 @@@ S:      Maintaine
  
  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
@@@ -2392,13 -2380,6 +2392,13 @@@ M:    stelian@popies.ne
  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
@@@ -2708,13 -2689,13 +2708,13 @@@ L:   i2c@lm-sensors.or
  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
  
@@@ -2919,9 -2900,6 +2919,9 @@@ M:      nico@cam.or
  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
@@@ -3438,13 -3416,6 +3438,13 @@@ P:      Alex Dubo
  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