Merge branch 'core/xen' into x86/urgent