]> 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)
commitd40941b30b5d854a1226a5a2cd9575344029b7c1
treedbea28420ff33aca40be8d3cd901305064b4ea24
parent426ff5d1f1dbbe5e7454c505042d74b51b71f745
parent95670508923d17ab9dbfd2c74868e0e97556bacd
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