]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'scsi/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 17 Sep 2012 03:17:08 +0000 (13:17 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 17 Sep 2012 03:17:08 +0000 (13:17 +1000)
commit09daf27cf183934bafb86b09b9d3b959bb1092ae
tree272d3763025327ebaad80d11f8b6b97479b3fe4b
parent04c65e3cc8a1b2e356f5ea528105c1a32e06d097
parent71cfff4af0525891941199b142b759d00b293959
Merge remote-tracking branch 'scsi/for-next'

Conflicts:
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