Merge branch 'topic/err_reporting' into for-linus
authorVinod Koul <vinod.koul@intel.com>
Mon, 3 Oct 2016 03:47:33 +0000 (09:17 +0530)
committerVinod Koul <vinod.koul@intel.com>
Mon, 3 Oct 2016 03:47:33 +0000 (09:17 +0530)
commit11bfedff5594eef74617e6aa02986cf517526b98
tree2aa1a3b8d4e71abda7103b41edffb3a92ca26784
parent0a98f4b857e9aedf426d8b5b07699a8526e07530
parent793ae66c7dcc7e6655029f6613221a111b15b58e
Merge branch 'topic/err_reporting' into for-linus

Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Conflicts:
drivers/dma/cppi41.c
drivers/dma/coh901318.c
drivers/dma/cppi41.c
drivers/dma/ep93xx_dma.c
drivers/dma/fsl_raid.c
drivers/dma/fsldma.c
drivers/dma/mmp_tdma.c
drivers/dma/mpc512x_dma.c
drivers/dma/ppc4xx/adma.c
drivers/dma/ste_dma40.c