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

Merge branch 'next/devel-samsung-iommu' into next/devel-samsung 

Conflicts:
	arch/arm/mach-exynos/Makefile
parents 18c411b7 2a96536e
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment