Merge branch 'dma' of http://git.linaro.org/git/people/nico/linux into devel-stable