Merge remote-tracking branch 'scsi-queue/drivers-for-3.16' into for-linus