Ingo Molnar a3eeeefbf1 Merge branch 'x86/tsc' into tracing/core ... Merge it to resolve this incidental conflict between the BTS fixes/cleanups and changes in x86/tsc: Conflicts: arch/x86/kernel/cpu/intel.c		2008-12-25 12:48:18 +01:00
..
asm	Merge branch 'x86/tsc' into tracing/core	2008-12-25 12:48:18 +01:00