Merge branch 'master' into upstream

diff --cc drivers/ata/libata-eh.c
Simple merge

diff --cc drivers/ata/sata_svw.c
index 2a7e3495cf160b506dd2b9a7ee10b4e8a949c75d,6b70c3c76dfdb9c087fe502af95c1e709fd5a7b0..d6d6658d8328b0a7c4796bba71b121c93ada8356
--- 1/drivers/ata/sata_svw.c
--- 2/drivers/scsi/sata_svw.c
+++ b/drivers/ata/sata_svw.c
@@@ -266,9 -266,9 +266,9 @@@ static int k2_sata_proc_info(struct Scs
                return 0;
  
        /* Match it to a port node */
 -      index = (ap == ap->host_set->ports[0]) ? 0 : 1;
 +      index = (ap == ap->host->ports[0]) ? 0 : 1;
        for (np = np->child; np != NULL; np = np->sibling) {
-               u32 *reg = (u32 *)get_property(np, "reg", NULL);
+               const u32 *reg = get_property(np, "reg", NULL);
                if (!reg)
                        continue;
                if (index == *reg)

diff --cc drivers/scsi/Kconfig
index 2df4d15c963432624c1e05c61d8a5ed0bd0e153d,a6f920d218a0266844b4e0819f3fbc75b124dffe..c4dfcc91dddaa07ea474037fd60f9245ae962d98
--- 1/drivers/scsi/Kconfig
--- 2/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@@ -469,8 -478,83 +478,22 @@@ config SCSI_IN200
          To compile this driver as a module, choose M here: the
          module will be called in2000.
  
+ config SCSI_ARCMSR
+       tristate "ARECA ARC11X0[PCI-X]/ARC12X0[PCI-EXPRESS] SATA-RAID support"
+       depends on PCI && SCSI
+       help
+         This driver supports all of ARECA's SATA RAID controller cards.
+         This is an ARECA-maintained driver by Erich Chen.
+         If you have any problems, please mail to: < erich@areca.com.tw >
+         Areca supports Linux RAID config tools.
+ 
+         < http://www.areca.com.tw >
+ 
+         To compile this driver as a module, choose M here: the
+         module will be called arcmsr (modprobe arcmsr).
+ 
  source "drivers/scsi/megaraid/Kconfig.megaraid"
  
 -config SCSI_SATA
 -      tristate "Serial ATA (SATA) support"
 -      depends on SCSI
 -      help
 -        This driver family supports Serial ATA host controllers
 -        and devices.
 -
 -        If unsure, say N.
 -
 -config SCSI_SATA_AHCI
 -      tristate "AHCI SATA support"
 -      depends on SCSI_SATA && PCI
 -      help
 -        This option enables support for AHCI Serial ATA.
 -
 -        If unsure, say N.
 -
 -config SCSI_SATA_SVW
 -      tristate "ServerWorks Frodo / Apple K2 SATA support"
 -      depends on SCSI_SATA && PCI
 -      help
 -        This option enables support for Broadcom/Serverworks/Apple K2
 -        SATA support.
 -
 -        If unsure, say N.
 -
 -config SCSI_ATA_PIIX
 -      tristate "Intel PIIX/ICH SATA support"
 -      depends on SCSI_SATA && PCI
 -      help
 -        This option enables support for ICH5/6/7/8 Serial ATA.
 -        If PATA support was enabled previously, this enables
 -        support for select Intel PIIX/ICH PATA host controllers.
 -
 -        If unsure, say N.
 -
 -config SCSI_SATA_MV
 -      tristate "Marvell SATA support (HIGHLY EXPERIMENTAL)"
 -      depends on SCSI_SATA && PCI && EXPERIMENTAL
 -      help
 -        This option enables support for the Marvell Serial ATA family.
 -        Currently supports 88SX[56]0[48][01] chips.
 -
 -        If unsure, say N.
 -
 -config SCSI_SATA_NV
 -      tristate "NVIDIA SATA support"
 -      depends on SCSI_SATA && PCI && EXPERIMENTAL
 -      help
 -        This option enables support for NVIDIA Serial ATA.
 -
 -        If unsure, say N.
 -
 -config SCSI_PDC_ADMA
 -      tristate "Pacific Digital ADMA support"
 -      depends on SCSI_SATA && PCI
 -      help
 -        This option enables support for Pacific Digital ADMA controllers
 -
 -        If unsure, say N.
 -
  config SCSI_HPTIOP
        tristate "HighPoint RocketRAID 3xxx Controller support"
        depends on SCSI && PCI

diff --cc drivers/scsi/Makefile
index b678f957cfe2c424f8564dce935df8d51b83f92f,8fc2c594b537b4293b5d9a17be6c5d16a15325fb..1ef951be7a5d1a5ff0716fa3f640df16386ab215
--- 1/drivers/scsi/Makefile
--- 2/drivers/scsi/Makefile
+++ b/drivers/scsi/Makefile
@@@ -122,7 -125,23 +125,8 @@@ obj-$(CONFIG_SCSI_LASI700)        += 53c700.o 
  obj-$(CONFIG_SCSI_NSP32)      += nsp32.o
  obj-$(CONFIG_SCSI_IPR)                += ipr.o
  obj-$(CONFIG_SCSI_IBMVSCSI)   += ibmvscsi/
 -obj-$(CONFIG_SCSI_SATA_AHCI)  += libata.o ahci.o
 -obj-$(CONFIG_SCSI_SATA_SVW)   += libata.o sata_svw.o
 -obj-$(CONFIG_SCSI_ATA_PIIX)   += libata.o ata_piix.o
 -obj-$(CONFIG_SCSI_SATA_PROMISE)       += libata.o sata_promise.o
 -obj-$(CONFIG_SCSI_SATA_QSTOR) += libata.o sata_qstor.o
 -obj-$(CONFIG_SCSI_SATA_SIL)   += libata.o sata_sil.o
 -obj-$(CONFIG_SCSI_SATA_SIL24) += libata.o sata_sil24.o
 -obj-$(CONFIG_SCSI_SATA_VIA)   += libata.o sata_via.o
 -obj-$(CONFIG_SCSI_SATA_VITESSE)       += libata.o sata_vsc.o
 -obj-$(CONFIG_SCSI_SATA_SIS)   += libata.o sata_sis.o
 -obj-$(CONFIG_SCSI_SATA_SX4)   += libata.o sata_sx4.o
 -obj-$(CONFIG_SCSI_SATA_NV)    += libata.o sata_nv.o
 -obj-$(CONFIG_SCSI_SATA_ULI)   += libata.o sata_uli.o
 -obj-$(CONFIG_SCSI_SATA_MV)    += libata.o sata_mv.o
 -obj-$(CONFIG_SCSI_PDC_ADMA)   += libata.o pdc_adma.o
  obj-$(CONFIG_SCSI_HPTIOP)     += hptiop.o
+ obj-$(CONFIG_SCSI_STEX)               += stex.o
  
  obj-$(CONFIG_ARM)             += arm/