Skip to content
Commit 56952baa authored by Kukjin Kim's avatar Kukjin Kim
Browse files

Merge branches 'next/pinctrl-samsung' and 'next/board-samsung' into next/dt-samsung-new 

Conflicts:
	arch/arm/mach-exynos/mach-smdkv310.c
parents 5698bd75 011527b4 fae9659a
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment