Merge branch 'linus' into core/generic-dma-coherent