Merge branch 'armsoc/for-3.12/soc' of git://github.com/broadcom/bcm11351 into next...