Merge remote branch 'tip/x86/tsc' into fortglx/2.6.38/tip/x86/tsc