tree 39a93460aa2c6eb8286fbba6c551f95443e175dd
parent 9042763808c5285a1a61b45b0fe98a710a4c903c
parent 63cc8c75156462d4b42cbdd76c293b7eee7ddbfe
author Ingo Molnar <mingo@elte.hu> 1220599470 +0200
committer Ingo Molnar <mingo@elte.hu> 1220599470 +0200

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>