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