]> nv-tegra.nvidia Code Review - linux-2.6.git/commit
Merge commit '63cc8c75156462d4b42cbdd76c293b7eee7ddbfe':
authorIngo Molnar <mingo@elte.hu>
Fri, 5 Sep 2008 07:24:30 +0000 (09:24 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 5 Sep 2008 07:24:30 +0000 (09:24 +0200)
commitd3d0ba7b8fb8f57c33207adcb41f40c176148c03
tree39a93460aa2c6eb8286fbba6c551f95443e175dd
parent9042763808c5285a1a61b45b0fe98a710a4c903c
parent63cc8c75156462d4b42cbdd76c293b7eee7ddbfe
Merge commit '63cc8c75156462d4b42cbdd76c293b7eee7ddbfe':

  "percpu: introduce DEFINE_PER_CPU_PAGE_ALIGNED() macro"

into x86/core

Conflicts:
arch/x86/kernel/cpu/common.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/cpu/common.c
arch/x86/kernel/vmlinux_32.lds.S
include/asm-generic/vmlinux.lds.h
include/linux/percpu.h