]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit5870e8efc731fa541900f1d4038676bca0d9c682
tree3c6d594539eb16fc955906da65b9fa7aacbc9145
parentbcdb14bef334970e2ef93641b81e07160180af47
parentd0409d46127755275c53866c34406d3307d4a01f
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