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

Merge branches 'prima2/soc' and 'clksrc/cleanup' into prima2/multiplatform

parents 5fa2f9af 4d10f054
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