Merge branch 'for-v3.18' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping