]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'isci/all'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 Apr 2012 01:46:31 +0000 (11:46 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 Apr 2012 01:46:31 +0000 (11:46 +1000)
Conflicts:
drivers/scsi/libsas/sas_discover.c
include/scsi/libsas.h

1  2 
drivers/scsi/libsas/sas_port.c
drivers/scsi/scsi_error.c
drivers/scsi/scsi_lib.c

Simple merge
Simple merge
Simple merge