Skip to content
Commit 09fa31a3 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'dt/gic' into highbank/soc 

Conflicts:
	arch/arm/Kconfig
parents 2b228e8c f37a53cc
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