Skip to content
Commit ab3ff12a authored by Simon Horman's avatar Simon Horman
Browse files

Merge branch 'soc' into boards 

Conflicts:
	arch/arm/configs/marzen_defconfig
parents 631a7b5d 29446286
Expand all 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