Merge /spare/repo/linux-2.6/

diff --combined drivers/scsi/Kconfig
index 10f3f4da68c53df08ea443e28c1a5641dd4c7fd4,20019b82b4a85f70a13b4a7edb26862c182180dd..be96cb78e3b50bb22729be956c889aa49adb2d64
--- 1/drivers/scsi/Kconfig
--- 2/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@@ -235,6 -235,13 +235,13 @@@ config SCSI_ISCSI_ATTR
          each attached iSCSI device to sysfs, say Y.
          Otherwise, say N.
  
+ config SCSI_SAS_ATTRS
+       tristate "SAS Transport Attributes"
+       depends on SCSI
+       help
+         If you wish to export transport-specific information about
+         each attached SAS device to sysfs, say Y.
+ 
  endmenu
  
  menu "SCSI low-level drivers"
@@@ -514,14 -521,6 +521,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 370a560c6aef38a7bfe6f25fb00c918e4bea23b9,1e4edbdf27304bc80a28f8b05d08f21580936b63..1e491ae9a7c5c319d0d3a7b1fe96fb0f422a28fc
--- 1/drivers/scsi/Makefile
--- 2/drivers/scsi/Makefile
+++ b/drivers/scsi/Makefile
@@@ -31,6 -31,7 +31,7 @@@ obj-$(CONFIG_RAID_ATTRS)      += raid_class.
  obj-$(CONFIG_SCSI_SPI_ATTRS)  += scsi_transport_spi.o
  obj-$(CONFIG_SCSI_FC_ATTRS)   += scsi_transport_fc.o
  obj-$(CONFIG_SCSI_ISCSI_ATTRS)        += scsi_transport_iscsi.o
+ obj-$(CONFIG_SCSI_SAS_ATTRS)  += scsi_transport_sas.o
  
  obj-$(CONFIG_SCSI_AMIGA7XX)   += amiga7xx.o   53c7xx.o
  obj-$(CONFIG_A3000_SCSI)      += a3000.o      wd33c93.o
@@@ -128,7 -129,6 +129,7 @@@ 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