]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'x86/urgent' into x86/platform, to resolve conflict
authorIngo Molnar <mingo@kernel.org>
Thu, 5 May 2016 07:56:10 +0000 (09:56 +0200)
committerIngo Molnar <mingo@kernel.org>
Thu, 5 May 2016 07:56:10 +0000 (09:56 +0200)
commitab484186b7f0e0d92506407243ef12cd3df97e35
treeeb05932753a4afb9d3c82949ef056085f79be1b5
parentdd68fec28e101003e78952f4bfd77b23d5f541a6
parent11915f86873d117ff5974f3be297893d91dff7e3
Merge branch 'x86/urgent' into x86/platform, to resolve conflict

Conflicts:
arch/x86/kernel/apic/x2apic_uv_x.c

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