summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2016-07-15 10:26:04 +0200
committerIngo Molnar <mingo@kernel.org>2016-07-15 10:26:04 +0200
commit38452af2424dc99854c78523d74b260fa8a984f0 (patch)
tree0dc49c27e1a58a0b35c23db05d85d2e8571ea471 /Makefile
parentx86/mm: Use pte_none() to test for empty PTE (diff)
parentx86/entry: Inline enter_from_user_mode() (diff)
downloadlinux-38452af2424dc99854c78523d74b260fa8a984f0.tar.xz
linux-38452af2424dc99854c78523d74b260fa8a984f0.zip
Merge branch 'x86/asm' into x86/mm, to resolve conflicts
Conflicts: tools/testing/selftests/x86/Makefile Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions