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

Browse source

Conflicts:
	arch/x86/kernel/entry_64.S

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

...

This commit is contained in:

Ingo Molnar 2015-03-24 21:14:07 +01:00

parent 72d64cc769 b3494a4ab2

commit 06ab9c1ba6

1 changed files with 13 additions and 2 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

15

arch/x86/kernel/entry_64.S

View file