Skip to content
Commit 259f47eb authored by Kevin Hilman's avatar Kevin Hilman
Browse files

Merge branch 'socfpga/soc' into next/soc 

* socfpga/soc:
  ARM: socfpga: fix build error due to secondary_startup
parents d97236e6 89b8da06
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