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)
  "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>

Trivial merge