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

Conflicts:
	drivers/scsi/ipr.c
	drivers/video/backlight/88pm860x_bl.c

diff --cc Documentation/dontdiff
Simple merge

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

diff --cc drivers/dma/ep93xx_dma.c
index 493735b9b2c92a3871d4f48d80301a604d924552,bb02fd981afb1c5c3566265ea3d682b135a193ce..8948e8ccefb6ec1bd3986d1118f15235bc956ee4
--- 1/drivers/dma/ep93xx_dma.c
--- 2/drivers/dma/ep93xx_dma.c
+++ b/drivers/dma/ep93xx_dma.c
@@@ -1118,9 -1118,8 +1118,9 @@@ fail
   * @chan: channel
   * @dma_addr: DMA mapped address of the buffer
   * @buf_len: length of the buffer (in bytes)
-  * @period_len: lenght of a single period
+  * @period_len: length of a single period
   * @dir: direction of the operation
 + * @flags: tx descriptor status flags
   * @context: operation context (ignored)
   *
   * Prepares a descriptor for cyclic DMA operation. This means that once the

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

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

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

diff --cc drivers/mfd/rc5t583.c
Simple merge

diff --cc drivers/mfd/rdc321x-southbridge.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/bfa/bfa_ioc.h
Simple merge

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

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/delayed-ref.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/fs-writeback.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