Merge branch 'next/topic-cpuid-rev' into next/topic-add-exynos4212
authorKukjin Kim <kgene.kim@samsung.com>
Fri, 16 Sep 2011 07:38:43 +0000 (16:38 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Fri, 16 Sep 2011 07:38:43 +0000 (16:38 +0900)
commitbe6bb8cc8d2bd033a1f89983f2f13bdb3548a08f
tree2b7f76cc2154e5589a605f97a663c8afe4f6016f
parentd03c35939d2a447093e60133156217d6512aa9e3
parentb02b5da4d15d7f7a250888d003121e1b5b69d00b
Merge branch 'next/topic-cpuid-rev' into next/topic-add-exynos4212
arch/arm/mach-exynos4/cpu.c
arch/arm/mach-exynos4/platsmp.c
arch/arm/mach-s5p64x0/irq-eint.c