Merge by hand

pci_ids.h (removal of on ID next to addition of another)
scsi_transport_iscsi.c: change of attribute_container_unregister
to transport_container_unregister.

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

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc drivers/pci/pci.ids
index 8cd76aeeef91599e83b32611e12c49b17a5a912f,68366878b1d56a6a0be0b65b8d6f173fa5ba8bcd..6e57168bcd394965b7197cb306d9a41e23dca66e
--- 1/drivers/pci/pci.ids
--- 2/drivers/pci/pci.ids
+++ b/drivers/pci/pci.ids
@@@ -1098,8 -973,6 +1098,7 @@@
        0180  Snipe chipset SCSI controller
                1014 0241  iSeries 2757 DASD IOA
                1014 0264  Quad Channel PCI-X U320 SCSI RAID Adapter (2780)
-               1014 02BD  Quad Channel PCI-X U320 DDR SCSI RAID Adapter (570F)
 +      0188  EADS-X PCI-X to PCI-X Bridge
        01a7  PCI-X to PCI-X Bridge
        01bd  ServeRAID Controller
                1014 01be  ServeRAID-4M
@@@ -1123,9 -996,10 +1122,11 @@@
        0268  Gigabit Ethernet-SX Adapter (PCI-X)
        0269  10/100/1000 Base-TX Ethernet Adapter (PCI-X)
        028C  Citrine chipset SCSI controller
-               1014 02BE  Dual Channel PCI-X U320 DDR SCSI RAID Adapter (571B)
+               1014 028D  Dual Channel PCI-X DDR SAS RAID Adapter (572E)
+               1014 02BE  Dual Channel PCI-X DDR U320 SCSI RAID Adapter (571B)
+               1014 02C0  Dual Channel PCI-X DDR U320 SCSI Adapter (571A)
        0302  X-Architecture Bridge [Summit]
 +      0314  ZISC 036 Neural accelerator card
        ffff  MPIC-2 interrupt controller
  1015  LSI Logic Corp of Canada
  1016  ICL Personal Systems

diff --cc drivers/scsi/53c700.c
Simple merge

diff --cc drivers/scsi/Kconfig
Simple merge

diff --cc drivers/scsi/dc395x.c
Simple merge

diff --cc drivers/scsi/hosts.c
Simple merge

diff --cc drivers/scsi/megaraid/megaraid_mm.c
Simple merge

diff --cc drivers/scsi/osst.c
Simple merge

diff --cc drivers/scsi/scsi_devinfo.c
Simple merge

diff --cc drivers/scsi/scsi_lib.c
Simple merge

diff --cc drivers/scsi/scsi_transport_fc.c
index 8e90174d5ce485faf7a9fd94b02372a427126e6c,a3eda1c05adc6ff1fb07ee7c90e1f458a4a12428..8079aae23ee8d2dacb9190d9dcf3eae48c57f9e8
--- 1/drivers/scsi/scsi_transport_fc.c
--- 2/drivers/scsi/scsi_transport_fc.c
+++ b/drivers/scsi/scsi_transport_fc.c
@@@ -847,9 -832,9 +832,12 @@@ void fc_release_transport(struct scsi_t
  {
        struct fc_internal *i = to_fc_internal(t);
  
+       transport_container_unregister(&i->t.target_attrs);
+       transport_container_unregister(&i->t.host_attrs);
+ 
 +      attribute_container_unregister(&i->t.target_attrs);
 +      attribute_container_unregister(&i->t.host_attrs);
 +
        kfree(i);
  }
  EXPORT_SYMBOL(fc_release_transport);

diff --cc drivers/scsi/scsi_transport_spi.c
index 83c038ea47aee05f924406260702b408614e5345,ed800ae7ea4eb983909ffd300cc1c6dbc4eec7f4..1bf7965a06fb1e9e633111a6382ae8cc28e6d8df
--- 1/drivers/scsi/scsi_transport_spi.c
--- 2/drivers/scsi/scsi_transport_spi.c
+++ b/drivers/scsi/scsi_transport_spi.c
@@@ -921,9 -986,9 +986,12 @@@ void spi_release_transport(struct scsi_
  {
        struct spi_internal *i = to_spi_internal(t);
  
+       transport_container_unregister(&i->t.target_attrs);
+       transport_container_unregister(&i->t.host_attrs);
+ 
 +      attribute_container_unregister(&i->t.target_attrs);
 +      attribute_container_unregister(&i->t.host_attrs);
 +
        kfree(i);
  }
  EXPORT_SYMBOL(spi_release_transport);

diff --cc drivers/scsi/sd.c
Simple merge

diff --cc drivers/scsi/sg.c
Simple merge

diff --cc drivers/scsi/sr.c
Simple merge

diff --cc drivers/scsi/st.c
Simple merge

diff --cc include/linux/pci_ids.h
Simple merge

diff --cc include/scsi/scsi_host.h
Simple merge