Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6