]> git.proxmox.com Git - mirror_ubuntu-eoan-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)
commit06ab9c1ba6a19977432b6906b0eee84804212dc6
tree6a69e2852e9ed71cd76d0d6b25694a361f64c306
parent72d64cc76941cde45e65e2a5b9fb81d527963645
parentb3494a4ab20f6bdf74cdf2badf7918bb65ee8a00
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