Merge remote-tracking branch 'tglx/x86/urgent' into x86/urgent