Merge branches 'next/pinctrl-samsung' and 'next/board-samsung' into next/dt-samsung-new
Conflicts: arch/arm/mach-exynos/mach-smdkv310.c
Showing
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Please register or sign in to comment