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

Conflicts:
	drivers/scsi/ipr.c

diff --cc Documentation/dontdiff
Simple merge

diff --cc drivers/dma/at_hdmac.c
Simple merge

diff --cc drivers/dma/imx-dma.c
Simple merge

diff --cc drivers/mfd/ab8500-gpadc.c
Simple merge

diff --cc drivers/mmc/host/atmel-mci.c
Simple merge

diff --cc drivers/mmc/host/omap_hsmmc.c
Simple merge

diff --cc drivers/mmc/host/vub300.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
Simple merge

diff --cc drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
Simple merge

diff --cc drivers/net/wireless/rtlwifi/rtl8192de/fw.c
Simple merge

diff --cc drivers/scsi/bfa/bfa_ioc.c
Simple merge

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

diff --cc drivers/scsi/ipr.c
index cff6503e5b6d0ffda3315756b35844f7493c60d6,1059c99690e69698d843d041f73375be2465c174..637e5527b082817bbd498518bc7dbfd954bd6ebb
--- 1/drivers/scsi/ipr.c
--- 2/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@@ -562,26 -562,9 +562,26 @@@ static void ipr_trc_hook(struct ipr_cmn
        trace_entry->u.add_data = add_data;
  }
  #else
- #define ipr_trc_hook(ipr_cmd, type, add_data) do { } while(0)
+ #define ipr_trc_hook(ipr_cmd, type, add_data) do { } while (0)
  #endif
  
 +/**
 + * ipr_lock_and_done - Acquire lock and complete command
 + * @ipr_cmd:  ipr command struct
 + *
 + * Return value:
 + *    none
 + **/
 +static void ipr_lock_and_done(struct ipr_cmnd *ipr_cmd)
 +{
 +      unsigned long lock_flags;
 +      struct ipr_ioa_cfg *ioa_cfg = ipr_cmd->ioa_cfg;
 +
 +      spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);
 +      ipr_cmd->done(ipr_cmd);
 +      spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
 +}
 +
  /**
   * ipr_reinit_ipr_cmnd - Re-initialize an IPR Cmnd block for reuse
   * @ipr_cmd:  ipr command struct
@@@ -6398,8 -6330,8 +6398,8 @@@ static int ipr_invalid_adapter(struct i
        int i;
  
        if ((ioa_cfg->type == 0x5702) && (ioa_cfg->pdev->revision < 4)) {
-               for (i = 0; i < ARRAY_SIZE(ipr_blocked_processors); i++){
+               for (i = 0; i < ARRAY_SIZE(ipr_blocked_processors); i++) {
 -                      if (__is_processor(ipr_blocked_processors[i]))
 +                      if (pvr_version_is(ipr_blocked_processors[i]))
                                return 1;
                }
        }

diff --cc drivers/scsi/isci/host.c
Simple merge

diff --cc drivers/scsi/isci/init.c
Simple merge

diff --cc drivers/scsi/lpfc/lpfc_init.c
Simple merge

diff --cc drivers/scsi/lpfc/lpfc_sli.c
Simple merge

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

diff --cc drivers/scsi/qla4xxx/ql4_os.c
Simple merge

diff --cc drivers/video/exynos/exynos_mipi_dsi.c
Simple merge

diff --cc drivers/w1/masters/ds1wm.c
Simple merge

diff --cc fs/btrfs/ctree.h
Simple merge

diff --cc fs/btrfs/inode.c
Simple merge

diff --cc fs/ext2/balloc.c
Simple merge

diff --cc fs/ext3/balloc.c
Simple merge

diff --cc fs/ext3/inode.c
Simple merge

diff --cc fs/ext4/inode.c
Simple merge

diff --cc fs/ext4/mballoc.c
Simple merge

diff --cc fs/nfs/super.c
Simple merge

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

diff --cc tools/perf/util/parse-events-test.c
Simple merge

diff --cc tools/perf/util/python-ext-sources
Simple merge