Merge branch 'linus' into x86/urgent
authorIngo Molnar <mingo@elte.hu>
Fri, 18 Mar 2011 09:38:53 +0000 (10:38 +0100)
committerIngo Molnar <mingo@elte.hu>
Fri, 18 Mar 2011 09:39:00 +0000 (10:39 +0100)
commit8dd8997d2c56c9f248294805e129e1fc69444380
tree3b030a04295fc031db98746c4074c2df1ed6a19f
parent1eda75c131ea42ec173323b6c34aeed78ae637c1
parent016aa2ed1cc9cf704cf76d8df07751b6daa9750f
Merge branch 'linus' into x86/urgent

Merge reason: Merge upstream commits to avoid conflicts in upcoming patches.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/Kconfig.cpu
arch/x86/include/asm/amd_nb.h
arch/x86/kernel/cpu/amd.c