Merge branch 'next/topic-cleanup-smdkv310' into next-samsung-cleanup