]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'x86/urgent' into x86/asm, to resolve conflict
authorIngo Molnar <mingo@kernel.org>
Tue, 24 Mar 2015 20:14:07 +0000 (21:14 +0100)
committerIngo Molnar <mingo@kernel.org>
Wed, 25 Mar 2015 12:19:43 +0000 (13:19 +0100)
commit20422f3b017604217c9d770b41bda93692e44fed
tree6a69e2852e9ed71cd76d0d6b25694a361f64c306
parent107be2711639712593828bc8d834c3c4350ff775
parent05b9be41655d56741b6ff23dbf3049ef5012406e
Merge branch 'x86/urgent' into x86/asm, to resolve conflict

Conflicts:
arch/x86/kernel/entry_64.S

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/kernel/entry_64.S