git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6edae70 3f0a676)
[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>

Trivial merge
Pandora Kernel Repository