]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'scsi/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 12 Sep 2013 02:26:24 +0000 (12:26 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 12 Sep 2013 02:26:24 +0000 (12:26 +1000)
1  2 
drivers/scsi/hpsa.c
drivers/scsi/lpfc/lpfc_attr.c
drivers/scsi/lpfc/lpfc_bsg.c
drivers/scsi/megaraid/megaraid_sas_fusion.h
include/linux/pci_ids.h

Simple merge
Simple merge
Simple merge
Simple merge