Merge tag 'arm-soc/for-4.2/soc-part2' of http://github.com/broadcom/stblinux into...