]> 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, 28 Sep 2012 01:22:32 +0000 (11:22 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Sep 2012 01:22:32 +0000 (11:22 +1000)
commit40d7626674195ce1e34c5377ed280acc70be86a0
tree69da924a218b6fcea4561ecef763f381b0c90958
parent0759f93d954afe6dd769a73f69bc19ce06c64f40
parent3da4202c7639db4f74bebe8a2e4b3a56327953b3
Merge remote-tracking branch 'scsi/for-next'

Conflicts:
drivers/scsi/ipr.c
drivers/scsi/qla2xxx/qla_nx.c
13 files changed:
MAINTAINERS
drivers/ata/libata-core.c
drivers/ata/libata-eh.c
drivers/scsi/hpsa.c
drivers/scsi/ipr.c
drivers/scsi/lpfc/lpfc_init.c
drivers/scsi/mpt2sas/mpt2sas_base.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