Merge branch 'bgmac-stingray-soc'