Merge branch 'samsung/defconfig' into next/defconfig