]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'linus' into x86/asm, to resolve conflict
authorIngo Molnar <mingo@kernel.org>
Fri, 10 Nov 2017 07:06:47 +0000 (08:06 +0100)
committerIngo Molnar <mingo@kernel.org>
Fri, 10 Nov 2017 07:06:47 +0000 (08:06 +0100)
commit88f64186aff55cf101dfe52a77aeb4bb7dff5de3
treedbea28420ff33aca40be8d3cd901305064b4ea24
parentbb467c8cc2d3f819b897de9f7fc8592a33295add
parentb4fe8d7cd672fac80573a97394ea866e01e57c2e
Merge branch 'linus' into x86/asm, to resolve conflict

 Conflicts:
arch/x86/mm/mem_encrypt.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/mm/mem_encrypt.c