Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6