Merge "ARM: dma-mapping: introduce DMA_ERROR_CODE constant" into msm-3.4