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)
commit3cd0b53553ce28da6fc828c601041c974e1c4dde
treeeb05932753a4afb9d3c82949ef056085f79be1b5
parentf68376fc9e6dc15a08e16f08c95e503f19ad8e34
parent08914f436bdd2ed60923f49cbc402307aba20fe4
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