]> git.neil.brown.name Git - history.git/commit
Merge by hand
authorJames Bottomley <jejb@titanic.il.steeleye.com>
Tue, 15 Mar 2005 03:33:30 +0000 (21:33 -0600)
committerJames Bottomley <jejb@titanic.il.steeleye.com>
Tue, 15 Mar 2005 03:33:30 +0000 (21:33 -0600)
commitdac1ab6d51e08056b0aac8889cf7c33fd7bf3702
tree0dd17b3ee7c0cf9e48ab8a9fbf045b62028137c4
parent4df73de0f5533d0040d0801b9c24657cbbe818b8
parentbd210e30da74cd7e156bcac85388642fab2aea2c
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>
18 files changed:
Documentation/kernel-parameters.txt
drivers/pci/pci.ids
drivers/scsi/53c700.c
drivers/scsi/Kconfig
drivers/scsi/dc395x.c
drivers/scsi/hosts.c
drivers/scsi/megaraid/megaraid_mm.c
drivers/scsi/osst.c
drivers/scsi/scsi_devinfo.c
drivers/scsi/scsi_lib.c
drivers/scsi/scsi_transport_fc.c
drivers/scsi/scsi_transport_spi.c
drivers/scsi/sd.c
drivers/scsi/sg.c
drivers/scsi/sr.c
drivers/scsi/st.c
include/linux/pci_ids.h
include/scsi/scsi_host.h