Merge branch 'fixes_for_v3.15' of git://git.linaro.org/people/mszyprowski/linux-dma...