From: James Bottomley <jejb@mulgrave.il.steeleye.com>
Date: Thu, 31 May 2007 04:57:05 +0000 (-0500)
Subject: [SCSI] Merge up to linux-2.6 head
X-Git-Tag: Ubuntu-5.0.0-8.9~41547^2~103
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=5bc65793cbf8da0d35f19ef025dda22887e79e80;p=mirror_ubuntu-disco-kernel.git

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

5bc65793cbf8da0d35f19ef025dda22887e79e80