Merge branch 'linus' into x86/urgent
authorIngo Molnar <mingo@kernel.org>
Sat, 25 Jan 2014 08:16:14 +0000 (09:16 +0100)
committerIngo Molnar <mingo@kernel.org>
Sat, 25 Jan 2014 08:16:14 +0000 (09:16 +0100)
commit2b45e0f9f34f718725e093f4e335600811d7105a
tree3c6d594539eb16fc955906da65b9fa7aacbc9145
parenta85eba8814631d0d48361c8b9a7ee0984e80c03c
parent15c81026204da897a05424c79263aea861a782cc
Merge branch 'linus' into x86/urgent

Merge in the x86 changes to apply a fix.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/Kconfig
arch/x86/kernel/cpu/amd.c
arch/x86/kernel/cpu/intel.c