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