Merge branch 'linus' into perf/core, to fix conflicts

[deliverable/linux.git] / arch / arm / mach-exynos / headsmp.S

diff --git a/arch/arm/mach-exynos/headsmp.S b/arch/arm/mach-exynos/headsmp.S
index cdd9d91e99330487926b3518343bc9e6906753bf..b54f9701e421e2ea9695fc9bcb5f44920cac66b2 100644 (file)
--- a/arch/arm/mach-exynos/headsmp.S
+++ b/arch/arm/mach-exynos/headsmp.S
@@ -1,5 +1,4 @@
 /*
- *  linux/arch/arm/mach-exynos4/headsmp.S
  *
  *  Cloned from linux/arch/arm/mach-realview/headsmp.S
  *