]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
projects / mirror_ubuntu-kernels.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0fd2e9c fec8f5a)
Merge branch 'upstream-x86-selftests' into WIP.x86/pti.base
authorIngo Molnar <mingo@kernel.org>
Sun, 17 Dec 2017 12:04:28 +0000 (13:04 +0100)
committerIngo Molnar <mingo@kernel.org>
Sun, 17 Dec 2017 12:04:28 +0000 (13:04 +0100)
Conflicts:
arch/x86/kernel/cpu/Makefile

Signed-off-by: Ingo Molnar <mingo@kernel.org>

Trivial merge
Ubuntu combined Linux kernel mirror