Merge branch 'topic/edma' into for-linus