Merge branch 'x86/trampoline' into x86/urgent