Merge /spare/repo/linux-2.6/

diff --combined drivers/scsi/Kconfig
index 79ba45c1e9c0bf0c15fbeb117ab2a9477fe52424,2d21265e650b2abc0d79bd1f2c50ef212d9b977b..10f3f4da68c53df08ea443e28c1a5641dd4c7fd4
--- 1/drivers/scsi/Kconfig
--- 2/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@@ -1,5 -1,11 +1,11 @@@
  menu "SCSI device support"
  
+ config RAID_ATTRS
+       tristate "RAID Transport Class"
+       default n
+       ---help---
+         Provides RAID
+ 
  config SCSI
        tristate "SCSI device support"
        ---help---
@@@ -250,7 -256,7 +256,7 @@@ config SCSI_DECNC
  
  config SCSI_DECSII
        tristate "DEC SII Scsi Driver"
-       depends on MACH_DECSTATION && SCSI && MIPS32
+       depends on MACH_DECSTATION && SCSI && 32BIT
  
  config BLK_DEV_3W_XXXX_RAID
        tristate "3ware 5/6/7/8xxx ATA-RAID support"
@@@ -459,6 -465,15 +465,15 @@@ config SCSI_ATA_PII
  
          If unsure, say N.
  
+ config SCSI_SATA_MV
+       tristate "Marvell SATA support"
+       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
@@@ -499,14 -514,6 +514,14 @@@ config SCSI_SATA_SI
  
          If unsure, say N.
  
 +config SCSI_SATA_SIL24
 +      tristate "Silicon Image 3124/3132 SATA support"
 +      depends on SCSI_SATA && PCI && EXPERIMENTAL
 +      help
 +        This option enables support for Silicon Image 3124/3132 Serial ATA.
 +
 +        If unsure, say N.
 +
  config SCSI_SATA_SIS
        tristate "SiS 964/180 SATA support"
        depends on SCSI_SATA && PCI && EXPERIMENTAL

diff --combined drivers/scsi/Makefile
index 64aaab64aeb6f1f11a5dee6d253cb7ede68a8c07,4b4fd94c2674cf6f3ac0b6c727ef2cd52f3d7be1..370a560c6aef38a7bfe6f25fb00c918e4bea23b9
--- 1/drivers/scsi/Makefile
--- 2/drivers/scsi/Makefile
+++ b/drivers/scsi/Makefile
@@@ -22,6 -22,8 +22,8 @@@ subdir-$(CONFIG_PCMCIA)               += pcmci
  
  obj-$(CONFIG_SCSI)            += scsi_mod.o
  
+ obj-$(CONFIG_RAID_ATTRS)      += raid_class.o
+ 
  # --- NOTE ORDERING HERE ---
  # For kernel non-modular link, transport attributes need to
  # be initialised before drivers
@@@ -126,13 -128,13 +128,14 @@@ obj-$(CONFIG_SCSI_ATA_PIIX)     += libata.
  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_ARM)             += arm/