[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)
commit5bc65793cbf8da0d35f19ef025dda22887e79e80
tree8291998abd73055de6f487fafa174ee2a5d3afee
parent6edae708bf77e012d855a7e2c7766f211d234f4f
parent3f0a6766e0cc5a577805732e5adb50a585c58175
[SCSI] Merge up to linux-2.6 head

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>
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