Merge ../linux-2.6

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

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

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

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

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

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

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

diff --cc drivers/scsi/sym53c8xx_2/sym_hipd.c
Simple merge

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