]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'scsi/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 25 Jul 2012 00:27:34 +0000 (10:27 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 25 Jul 2012 00:27:34 +0000 (10:27 +1000)
commitccad6a680ce1aa979a3978e46ce2d171807fa488
treef216b3db83b872e31bbb1f87a4363e404b41c9b2
parent482a91d0c68ce7101d5abe548a66713b6b04ec49
parentb49951e39c71c16d3498f862c52bec5792a41f42
Merge remote-tracking branch 'scsi/for-next'

Conflicts:
drivers/ata/libata-core.c
include/scsi/scsi_device.h
12 files changed:
Documentation/kernel-parameters.txt
drivers/ata/libata-core.c
drivers/regulator/core.c
drivers/scsi/bnx2fc/bnx2fc.h
drivers/scsi/bnx2fc/bnx2fc_fcoe.c
drivers/scsi/cxgbi/cxgb4i/cxgb4i.c
drivers/scsi/scsi_lib.c
drivers/scsi/scsi_transport_iscsi.c
include/linux/libata.h
include/scsi/scsi.h
include/scsi/scsi_device.h
sound/soc/soc-dapm.c