Merge branch 'x86/urgent' into x86/platform, to resolve conflict

Browse source

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

Signed-off-by: Ingo Molnar <mingo@kernel.org>

...

This commit is contained in:

Ingo Molnar 2016-05-05 09:56:10 +02:00

parent f68376fc9e 08914f436b

commit 3cd0b53553

1 changed files with 1 additions and 3 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

4

arch/x86/kernel/apic/x2apic_uv_x.c

View file