Merge branch 'topic/brcm' into for-linus