bk://linux-scsi.bkbits.net/scsi-misc-2.6 # This is a BitKeeper generated diff -Nru style patch. # # ChangeSet # 2005/03/18 15:39:49-08:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-scsi # # include/linux/pci_ids.h # 2005/03/18 15:39:41-08:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2005/03/18 12:00:23-08:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-scsi # # include/linux/pci_ids.h # 2005/03/18 12:00:18-08:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2005/03/15 23:54:35-08:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-scsi # # include/scsi/scsi_host.h # 2005/03/15 23:54:27-08:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/scsi/st.c # 2005/03/15 23:54:27-08:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/scsi/scsi_transport_fc.c # 2005/03/15 23:54:26-08:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/scsi/scsi_lib.c # 2005/03/15 23:54:26-08:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/scsi/hosts.c # 2005/03/15 23:54:26-08:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2005/03/15 13:21:11-08:00 akpm@bix.(none) # Merge bk://linux-scsi.bkbits.net/scsi-misc-2.6 # into bix.(none):/usr/src/bk-scsi # # include/scsi/scsi_host.h # 2005/03/15 13:21:06-08:00 akpm@bix.(none) +0 -0 # Auto merged # # include/linux/pci_ids.h # 2005/03/15 13:21:06-08:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/scsi/st.c # 2005/03/15 13:21:06-08:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/scsi/sr.c # 2005/03/15 13:21:06-08:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/scsi/sg.c # 2005/03/15 13:21:06-08:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/scsi/sd.c # 2005/03/15 13:21:06-08:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/scsi/scsi_transport_spi.c # 2005/03/15 13:21:06-08:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/scsi/scsi_transport_fc.c # 2005/03/15 13:21:06-08:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/scsi/scsi_lib.c # 2005/03/15 13:21:06-08:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/scsi/scsi_devinfo.c # 2005/03/15 13:21:06-08:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/scsi/osst.c # 2005/03/15 13:21:06-08:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/scsi/megaraid/megaraid_mm.c # 2005/03/15 13:21:06-08:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/scsi/hosts.c # 2005/03/15 13:21:06-08:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/scsi/dc395x.c # 2005/03/15 13:21:06-08:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/scsi/Kconfig # 2005/03/15 13:21:05-08:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/scsi/53c700.c # 2005/03/15 13:21:05-08:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/pci/pci.ids # 2005/03/15 13:21:05-08:00 akpm@bix.(none) +0 -0 # Auto merged # # Documentation/kernel-parameters.txt # 2005/03/15 13:21:05-08:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2005/03/15 00:03:31-08:00 akpm@bix.(none) # s # # drivers/pci/pci.ids # 2005/03/15 00:03:22-08:00 akpm@bix.(none) +1 -0 # s # # include/scsi/scsi_host.h # 2005/03/14 23:59:34-08:00 akpm@bix.(none) +0 -0 # Auto merged # # include/linux/pci_ids.h # 2005/03/14 23:59:34-08:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/scsi/st.c # 2005/03/14 23:59:34-08:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/scsi/sr.c # 2005/03/14 23:59:34-08:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/scsi/megaraid/megaraid_mm.c # 2005/03/14 23:59:34-08:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/scsi/sg.c # 2005/03/14 23:59:33-08:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/scsi/sd.c # 2005/03/14 23:59:33-08:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/scsi/scsi_transport_spi.c # 2005/03/14 23:59:33-08:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/scsi/scsi_transport_fc.c # 2005/03/14 23:59:33-08:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/scsi/scsi_lib.c # 2005/03/14 23:59:33-08:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/scsi/scsi_devinfo.c # 2005/03/14 23:59:33-08:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/scsi/osst.c # 2005/03/14 23:59:33-08:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/scsi/hosts.c # 2005/03/14 23:59:33-08:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/scsi/dc395x.c # 2005/03/14 23:59:33-08:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/scsi/Kconfig # 2005/03/14 23:59:33-08:00 akpm@bix.(none) +0 -0 # Auto merged # # drivers/scsi/53c700.c # 2005/03/14 23:59:33-08:00 akpm@bix.(none) +0 -0 # Auto merged # # Documentation/kernel-parameters.txt # 2005/03/14 23:59:32-08:00 akpm@bix.(none) +0 -0 # Auto merged # diff -Nru a/drivers/pci/pci.ids b/drivers/pci/pci.ids --- a/drivers/pci/pci.ids 2005-03-23 19:53:33 -08:00 +++ b/drivers/pci/pci.ids 2005-03-23 19:53:33 -08:00 @@ -1098,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