From: Ingo Molnar Date: Fri, 5 Sep 2008 07:24:30 +0000 (+0200) Subject: Merge commit '63cc8c75156462d4b42cbdd76c293b7eee7ddbfe': X-Git-Tag: v2.6.28-rc1~711^2^2~44^2 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d3d0ba7b8fb8f57c33207adcb41f40c176148c03;p=pandora-kernel.git 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 --- d3d0ba7b8fb8f57c33207adcb41f40c176148c03 Reading git-diff-tree failed