Merge branch 'x86/vmware' into x86/trampoline