]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'x86/asm' into x86/core, to prepare for new patch
authorIngo Molnar <mingo@kernel.org>
Mon, 8 Jun 2015 18:48:01 +0000 (20:48 +0200)
committerIngo Molnar <mingo@kernel.org>
Mon, 8 Jun 2015 18:48:20 +0000 (20:48 +0200)
commit719dcf1bfa6f8a5e2610363b946cbf6ac6256c4e
treec563b728d879c2b446a8f1c33ce351ffb1f1d34e
parentc3c079e1bf72a3f546790c47301ec58f069b44a2
parentedbc275cd3fe74c993f729a817b118a1b9fd45f1
Merge branch 'x86/asm' into x86/core, to prepare for new patch

Collect all changes to arch/x86/entry/entry_64.S, before applying
patch that changes most of the file.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
MAINTAINERS
arch/x86/entry/entry_64.S
arch/x86/include/asm/msr.h
arch/x86/kernel/cpu/common.c
arch/x86/kernel/traps.c