]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[SCSI] Merge up to linux-2.6 head
authorJames Bottomley <jejb@mulgrave.il.steeleye.com>
Thu, 31 May 2007 04:57:05 +0000 (23:57 -0500)
committerJames Bottomley <jejb@mulgrave.il.steeleye.com>
Thu, 31 May 2007 04:57:05 +0000 (23:57 -0500)
Conflicts:

drivers/scsi/jazz_esp.c

Same changes made by both SCSI and SPARC trees: problem with UTF-8
conversion in the copyright.

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
1  2 
drivers/ieee1394/sbp2.c
drivers/message/fusion/mptscsih.c
drivers/scsi/Kconfig
drivers/scsi/Makefile
drivers/scsi/aacraid/aachba.c
drivers/scsi/aacraid/aacraid.h
drivers/scsi/ipr.c
drivers/scsi/sd.c
drivers/scsi/stex.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge