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

Merge branch 'next/dt-samsung' into next/dt-samsung-new 

Conflicts:
	arch/arm/boot/dts/exynos4210-origen.dts
	arch/arm/boot/dts/exynos4210.dtsi
parents 56952baa c8c24dad
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