Merge ../linux-2.6

author James Bottomley <jejb@mulgrave.il.steeleye.com>

Tue, 21 Mar 2006 19:05:45 +0000 (13:05 -0600)

committer James Bottomley <jejb@mulgrave.il.steeleye.com>

Tue, 21 Mar 2006 19:05:45 +0000 (13:05 -0600)
author James Bottomley <jejb@mulgrave.il.steeleye.com>
Tue, 21 Mar 2006 19:05:45 +0000 (13:05 -0600)
committer James Bottomley <jejb@mulgrave.il.steeleye.com>
Tue, 21 Mar 2006 19:05:45 +0000 (13:05 -0600)
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
author	James Bottomley <jejb@mulgrave.il.steeleye.com>
	Tue, 21 Mar 2006 19:05:45 +0000 (13:05 -0600)
committer	James Bottomley <jejb@mulgrave.il.steeleye.com>
	Tue, 21 Mar 2006 19:05:45 +0000 (13:05 -0600)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/scsi/scsi_error.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/scsi/scsi_transport_fc.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/device.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/pci_ids.h	patch \|	diff1 \|	diff2 \|	blob \| history