Skip to content
GitLab
Commit d702d121 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge with mainline to remove plat-omap/Kconfig conflict 

Conflicts:
	arch/arm/plat-omap/Kconfig
parents 9418c65f ac0f6f92
Hide whitespace changes
Inline Side-by-side
Supports Markdown
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