Merge branch 'bcm7xxx'