]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'scsi/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Sep 2012 01:13:47 +0000 (11:13 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Sep 2012 01:13:47 +0000 (11:13 +1000)
commitec520c46b44dbfc939564c1d687246388f9bf6dc
tree519169882148898833544aa1fbd693aa6b846e9e
parent916b0fcae9a361214e41aeb6e1e1c33c5979817d
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