mirror of
https://github.com/torvalds/linux.git
synced 2025-12-07 20:06:24 +00:00
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>