]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'scsi/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 21 Sep 2012 01:14:19 +0000 (11:14 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 21 Sep 2012 01:14:19 +0000 (11:14 +1000)
commitda757db913a9922ac6ece1bf79ea673a73fe50a5
tree05c92587923eb9f98fc2d8afa9e33de7563c4c84
parentc163d20d52188c5e9e19b2adf918ea989a19ada6
parentcea6340bfc65764c619f9b64d2693b45970eff60
Merge remote-tracking branch 'scsi/for-next'

Conflicts:
drivers/scsi/ipr.c
drivers/scsi/qla2xxx/qla_nx.c
MAINTAINERS
drivers/ata/libata-core.c
drivers/ata/libata-eh.c
drivers/scsi/ipr.c
drivers/scsi/lpfc/lpfc_init.c
drivers/scsi/mpt2sas/mpt2sas_scsih.c
drivers/scsi/qla2xxx/qla_nx.c
drivers/scsi/qla2xxx/qla_os.c
drivers/scsi/qla4xxx/ql4_nx.c
drivers/scsi/qla4xxx/ql4_os.c
include/linux/libata.h