Merge branch 'next/hdmi-samsung' into next/devel-samsung