]> 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)
commit5c3e444a5b2c9eaf760e64b95860bf7000e457ca
tree6a69e2852e9ed71cd76d0d6b25694a361f64c306
parent5620783b96909c0b62412666d88ee340fd2b1a92
parent92439862bd3232077f5fadefb7684822a8c14e81
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