Merge branch 'topic/bcm' into for-linus