Merge branch 'topic/at_xdmac' into for-linus