arch/x86/entry/syscalls/Makefile · 5f9e832c137075045d15cd6899ab0505cfb2ca4b · Dennis Giaya / linux · GitLab

Nov 07, 2017
67caadc6
Merge branch 'x86/build' into x86/asm, to fix up conflicts · 67caadc6
Ingo Molnar authored Nov 07, 2017
```
Conflicts:
	arch/x86/entry/syscalls/Makefile

Signed-off-by: Ingo Molnar <mingo@kernel.org>
```
67caadc6
Merge branch 'x86/build' into x86/asm, to fix up conflicts
Ingo Molnar authored Nov 07, 2017
```
Conflicts:
	arch/x86/entry/syscalls/Makefile

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