Merge branch 'topic/xdmac' into for-linus