Merge commit 'v2.6.38-rc4' into x86/cpu
authorIngo Molnar <mingo@elte.hu>
Mon, 14 Feb 2011 12:18:51 +0000 (13:18 +0100)
committerIngo Molnar <mingo@elte.hu>
Mon, 14 Feb 2011 12:18:56 +0000 (13:18 +0100)
commit91e04ec05838a5b2c790decf2a91af98cb1666e8
treeea7373bdfab118ab6312ed3fa1fc0694ccfb38db
parent792363d2beceb1c7d865e517fa9939c8b8c1442a
parent100b33c8bd8a3235fd0b7948338d6cbb3db3c63d
Merge commit 'v2.6.38-rc4' into x86/cpu

Merge reason: pick up the latest fixes.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/include/asm/smp.h
arch/x86/kernel/smpboot.c