Merge remote-tracking branch 'scsi-queue/drivers-for-3.17' into for-next