Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma