]> git.karo-electronics.de Git - karo-tx-linux.git/commit
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)
commita27486789bf1db65ac0ae42cc5f88cd3a59d45a0
tree3fa6e928a4fef2e1f0866e27b845953d40cd99e5
parent5aa2b89062f54c2ad1ed612b9b55677485a1a75a
parent475448adcd1e66ce3af1dc97c9c6a25f2d4b9662
Merge remote-tracking branch 'isci/all'

Conflicts:
drivers/scsi/libsas/sas_discover.c
include/scsi/libsas.h
drivers/scsi/libsas/sas_port.c
drivers/scsi/scsi_error.c
drivers/scsi/scsi_lib.c