Merge tag 'armsoc-drivers' into test-merge