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


Trivial merge