Commits
Merge branches 'next/pinctrl-samsung' and 'next/board-samsung' into next/dt-samsung-new Conflicts: arch/arm/mach-exynos/mach-smdkv310.c
Showing diff tofae9659a2ca
Merge branches 'next/pinctrl-samsung' and 'next/board-samsung' into next/dt-samsung-new Conflicts: arch/arm/mach-exynos/mach-smdkv310.c