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