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