Merge branch 'next-samsung-asoc' into next-samsung-asoc2