Merge branch 'x86/tsc' into x86/core