Merge tag 'armsoc/for-3.15/cleanup' of git://github.com/broadcom/mach-bcm into next...