tree 28eedba6d432e9d9d772962e6f92732aef1be065
parent 30cd324e9787ccc9a5ede59742d5409857550692
parent 7e3cbc3f774f31ecd88a51edae3d9377f60a4c00
author Ingo Molnar <mingo@elte.hu> 1230205698 +0100
committer Ingo Molnar <mingo@elte.hu> 1230205698 +0100

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