From: Linus Torvalds Date: Tue, 14 Mar 2006 19:03:50 +0000 (-0800) Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0f511ea70600efb1e06d7b55e1c51a83aff8713c;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git Merge /linux/kernel/git/jejb/scsi-rc-fixes-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6: [SCSI] zfcp: fix device registration issues [SCSI] scsi_transport_fc: fix FC_HOST_NUM_ATTRS [SCSI] scsi: aha152x pcmcia driver needs spi transport [SCSI] zfcp: correctly set this_id for hosts [SCSI] Add Brownie to blacklist --- 0f511ea70600efb1e06d7b55e1c51a83aff8713c