]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'x86/mm' into x86/asm, to merge branches
authorIngo Molnar <mingo@kernel.org>
Fri, 10 Nov 2017 07:05:30 +0000 (08:05 +0100)
committerIngo Molnar <mingo@kernel.org>
Fri, 10 Nov 2017 07:05:30 +0000 (08:05 +0100)
commit426ff5d1f1dbbe5e7454c505042d74b51b71f745
treef3365e4bf1064737a36e5488641a14e54fc173bc
parent640fb252c0d02cdca1b870008e61792a3162080e
parentb42d32d4de47bbadfcec379e29ad58f6cb0758e5
Merge branch 'x86/mm' into x86/asm, to merge branches

Most of x86/mm is already in x86/asm, so merge the rest too.

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