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