Merge remote-tracking branch 'scsi/for-next'

Conflicts:
	drivers/ata/libata-core.c
	include/scsi/scsi_device.h

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc drivers/ata/libata-core.c
index c14f88c1f1da910b3227dfa2e4658d99d68fe588,da316916e54242fc51f0d600991605573bf1e894..4843fd6c32f44b54f718911886d5d0ea5a716636
--- 1/drivers/ata/libata-core.c
--- 2/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@@ -5291,9 -5294,10 +5297,8 @@@ static int ata_port_request_pm(struct a
        return rc;
  }
  
- static int ata_port_suspend_common(struct device *dev, pm_message_t mesg)
 -#define to_ata_port(d) container_of(d, struct ata_port, tdev)
 -
+ static int __ata_port_suspend_common(struct ata_port *ap, pm_message_t mesg, int *async)
  {
-       struct ata_port *ap = to_ata_port(dev);
        unsigned int ehi_flags = ATA_EHI_QUIET;
        int rc;
  

diff --cc drivers/regulator/core.c
Simple merge

diff --cc drivers/scsi/bnx2fc/bnx2fc.h
index 42969e8a45bdab877313f7792aab7b2ea12313ef,514747562f53f857dd083ebf8e129972cd073cb5..3486845ba301b095525f25ba26de0e809bf27ef9
--- 1/drivers/scsi/bnx2fc/bnx2fc.h
--- 2/drivers/scsi/bnx2fc/bnx2fc.h
+++ b/drivers/scsi/bnx2fc/bnx2fc.h
@@@ -57,9 -59,7 +59,8 @@@
  #include <scsi/fc/fc_fcp.h>
  
  #include "57xx_hsi_bnx2fc.h"
- #include "bnx2fc_debug.h"
  #include "../../net/ethernet/broadcom/cnic_if.h"
 +#include  "../../net/ethernet/broadcom/bnx2x/bnx2x_mfw_req.h"
  #include "bnx2fc_constants.h"
  
  #define BNX2FC_NAME           "bnx2fc"

diff --cc drivers/scsi/bnx2fc/bnx2fc_fcoe.c
Simple merge

diff --cc drivers/scsi/cxgbi/cxgb4i/cxgb4i.c
Simple merge

diff --cc drivers/scsi/scsi_lib.c
Simple merge

diff --cc drivers/scsi/scsi_transport_iscsi.c
Simple merge

diff --cc include/linux/libata.h
Simple merge

diff --cc include/scsi/scsi.h
Simple merge

diff --cc include/scsi/scsi_device.h
index cfd951b5ca2907a036c9cb295a6748fc9eb3b8e2,7539f52a33c9d5b30ee71f8d484a59a9f17b52fd..56d6a6816c019fb8ccab977026f2ff384cdba96c
--- 1/include/scsi/scsi_device.h
--- 2/include/scsi/scsi_device.h
+++ b/include/scsi/scsi_device.h
@@@ -153,8 -154,7 +154,9 @@@ struct scsi_device 
        unsigned no_read_capacity_16:1; /* Avoid READ_CAPACITY_16 cmds */
        unsigned try_rc_10_first:1;     /* Try READ_CAPACACITY_10 first */
        unsigned is_visible:1;  /* is the device visible in sysfs */
 +      unsigned can_power_off:1; /* Device supports runtime power off */
 +      unsigned wakeup_by_user:1;      /* user wakes up the ODD */
+       unsigned wce_default_on:1;      /* Cache is ON by default */
  
        DECLARE_BITMAP(supported_events, SDEV_EVT_MAXBITS); /* supported events */
        struct list_head event_list;    /* asserted events */

diff --cc sound/soc/soc-dapm.c
Simple merge