Merge ../linux-2.6
James Bottomley [Tue, 21 Mar 2006 19:05:45 +0000 (13:05 -0600)]
1  2 
MAINTAINERS
drivers/scsi/scsi_error.c
drivers/scsi/scsi_transport_fc.c
include/linux/device.h
include/linux/pci_ids.h

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge