Merge "Merge b68ee1c6 ("Merge tag 'scsi-misc' of...

Merge "Merge b68ee1c6 ("Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi") into android-mainline" into android-mainline