]> 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)
commit197113084a2ad26ae74dd0b3ce60c0bad6fcccd7
treed36388a7af0948af048542d25a35ae36d1570379
parent76d43b5a3d89b1de93a3a4802b9f84b44511d0c9
parentda224ad6180abc548a33c571cd02ffbb57095087
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