Merge branch 'next/board-samsung' into next/board-samsung-2