From: Olof Johansson <olof@lixom.net>
Date: Tue, 17 Jan 2012 06:46:06 +0000 (-0800)
Subject: Merge branch 'fixes-for-arm-soc' of git://sources.calxeda.com/kernel/linux into fixes
X-Git-Tag: v3.3-rc1~18^2~1
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=8b0f6d12de91345190f234edba781b2fd03257b6;p=~emulex%2Finfiniband.git

Merge branch 'fixes-for-arm-soc' of git://sources.calxeda.com/kernel/linux into fixes

* 'fixes-for-arm-soc' of git://sources.calxeda.com/kernel/linux:
  ARM: make BSYM macro assembly only
  ARM: highbank: remove incorrect BSYM usage
  ARM: imx: remove incorrect BSYM usage
  ARM: exynos: remove incorrect BSYM usage
  ARM: ux500: add missing ENDPROC to headsmp.S
  ARM: msm: Add missing ENDPROC to headsmp.S
  ARM: versatile: Add missing ENDPROC to headsmp.S
---

8b0f6d12de91345190f234edba781b2fd03257b6