Merge branch 'x86/urgent' into x86/asm, to refresh the tree
authorIngo Molnar <mingo@kernel.org>
Fri, 29 Apr 2016 09:55:04 +0000 (11:55 +0200)
committerIngo Molnar <mingo@kernel.org>
Fri, 29 Apr 2016 09:55:04 +0000 (11:55 +0200)
commitffc5fce9a96303c3e16232a6bdf8827af6adb604
treec8c46b2af268d27e07ee7fad8c283fa7d31b1fb7
parentb2eafe890d4a09bfa63ab31ff018d7d6bb8cfefc
parent1bdb8970392a68489b469c3a330a1adb5ef61beb
Merge branch 'x86/urgent' into x86/asm, to refresh the tree

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/kernel/apic/vector.c
arch/x86/kernel/head_32.S