Merge branch 'x86/asmlinkage'

diff --cc arch/x86/include/asm/pgtable.h
Simple merge

diff --cc arch/x86/kernel/cpu/amd.c
Simple merge

diff --cc arch/x86/kernel/kprobes/core.c
Simple merge

diff --cc arch/x86/kernel/kprobes/opt.c
Simple merge