Automatic merge of rsync://www.parisc-linux.org/~jejb/git/scsi-for-linus-2.6.git