Merge branches 'x86/urgent' and 'x86/pat' into x86/core