Merge branch 'x86/build' into x86/asm, to fix up conflicts

Browse source

Conflicts:
	arch/x86/entry/syscalls/Makefile

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

...

This commit is contained in:

Ingo Molnar 2017-11-07 10:54:30 +01:00

parent b3d9a13681 af8e947079

commit 67caadc611

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

4

arch/x86/entry/syscalls/Makefile

View file