tree 4b6015433a0ffe5fc7ff9115014e3da580581f4b
parent 916e5ebb9f5a154bb845d555a1a84ef48411b73a
parent efb963dcd9854c70667cdba9b5854b7290f1cefd
author Olof Johansson <olof@lixom.net> 1326782766 -0800
committer Olof Johansson <olof@lixom.net> 1326782766 -0800

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