]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
projects / users / jedix / linux-maple.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 916e5eb efb963d)
Merge branch 'fixes-for-arm-soc' of git://sources.calxeda.com/kernel/linux into fixes
authorOlof Johansson <olof@lixom.net>
Tue, 17 Jan 2012 06:46:06 +0000 (22:46 -0800)
committerOlof Johansson <olof@lixom.net>
Tue, 17 Jan 2012 06:46:06 +0000 (22:46 -0800)
* '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

1  2 
arch/arm/mach-exynos/platsmp.c patch | diff1 | diff2 | blob | history
arch/arm/mach-highbank/highbank.c patch | diff1 | diff2 | blob | history
arch/arm/mach-imx/src.c patch | diff1 | diff2 | blob | history

diff --cc arch/arm/mach-exynos/platsmp.c
Simple merge
diff --cc arch/arm/mach-highbank/highbank.c
Simple merge
diff --cc arch/arm/mach-imx/src.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.