Merge tag 'asoc-v4.2' into asoc-rt5645