]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'x86/build' into x86/asm, to fix up conflicts
authorIngo Molnar <mingo@kernel.org>
Tue, 7 Nov 2017 09:54:30 +0000 (10:54 +0100)
committerIngo Molnar <mingo@kernel.org>
Tue, 7 Nov 2017 09:54:30 +0000 (10:54 +0100)
commit396b8cb20f7d5db8304c224030f13be277f7f93c
treed36388a7af0948af048542d25a35ae36d1570379
parentca09856d1b17d14e4e3138f8194be8fa610fe2d9
parent4697c702823e9aa0ec0a0e9ef44ea63e5c722b8e
Merge branch 'x86/build' into x86/asm, to fix up conflicts

Conflicts:
arch/x86/entry/syscalls/Makefile

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/entry/syscalls/Makefile