Merge ../linux-2.6

diff --cc MAINTAINERS
Simple merge

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

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

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

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