From: Kevin Hilman <khilman@linaro.org>
Date: Thu, 11 Jun 2015 22:50:10 +0000 (-0700)
Subject: Merge branch 'socfpga/soc' into next/soc
X-Git-Tag: firefly_0821_release~176^2~1557^2~2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=259f47eb4411c2e7f50372bb388c074d5729cca2;p=firefly-linux-kernel-4.4.55.git

Merge branch 'socfpga/soc' into next/soc

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

259f47eb4411c2e7f50372bb388c074d5729cca2