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

Merge branch 'heads/soc2' into boards2-base 

Conflicts:
	arch/arm/mach-shmobile/board-lager.c
parents 63862f14 687c27b0
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