Merge tag 'for-3.17/bcm-soc' of git://github.com/broadcom/mach-bcm into next/soc