projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0fd2e9c
fec8f5a
)
Merge branch 'upstream-x86-selftests' into WIP.x86/pti.base
author
Ingo Molnar
<mingo@kernel.org>
Sun, 17 Dec 2017 12:04:28 +0000
(13:04 +0100)
committer
Ingo 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