Merge branch 'socfpga/soc' into next/soc
authorKevin Hilman <khilman@linaro.org>
Thu, 11 Jun 2015 22:50:10 +0000 (15:50 -0700)
committerKevin Hilman <khilman@linaro.org>
Thu, 11 Jun 2015 22:50:10 +0000 (15:50 -0700)
commit259f47eb4411c2e7f50372bb388c074d5729cca2
tree66a9cc6eae9468ac31541e8346d7479aa524b4d5
parentd97236e656308ca651aea55de64a0e4089b5ad35
parent89b8da06ba302dd130df60df7964ccd3ab151cd6
Merge branch 'socfpga/soc' into next/soc

* socfpga/soc:
  ARM: socfpga: fix build error due to secondary_startup