]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'scsi/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 25 Oct 2011 06:15:58 +0000 (17:15 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 25 Oct 2011 06:15:58 +0000 (17:15 +1100)
commite9cc3a65611957fa7d3576477bd39834fc36a9e6
tree8d4e4577b9d399c15fd31af1813b2b899f4399cf
parent972a8b590f0c6c64b3efd269598b06b7f83ba9bb
parent590134fa78fbdbe5fea78c7ae0b2c3364bc9572f
Merge remote-tracking branch 'scsi/master'

Conflicts:
drivers/s390/cio/qdio_main.c
12 files changed:
drivers/ata/libata-core.c
drivers/s390/cio/qdio_main.c
drivers/scsi/Kconfig
drivers/scsi/Makefile
drivers/scsi/cxgbi/cxgb3i/cxgb3i.c
drivers/scsi/fcoe/fcoe.c
drivers/scsi/libfc/fc_exch.c
drivers/scsi/libfc/fc_fcp.c
drivers/scsi/libsas/sas_expander.c
drivers/scsi/qla2xxx/qla_isr.c
drivers/scsi/qla2xxx/qla_os.c
drivers/scsi/qla4xxx/Kconfig