Merge branch 'x86/tsc' into tracing/core
authorIngo Molnar <mingo@elte.hu>
Thu, 25 Dec 2008 11:48:18 +0000 (12:48 +0100)
committerIngo Molnar <mingo@elte.hu>
Thu, 25 Dec 2008 11:48:18 +0000 (12:48 +0100)
commita3eeeefbf1cd1d142c52238cc19c75d14c3bc8d5
tree28eedba6d432e9d9d772962e6f92732aef1be065
parent30cd324e9787ccc9a5ede59742d5409857550692
parent7e3cbc3f774f31ecd88a51edae3d9377f60a4c00
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
arch/x86/kernel/cpu/intel.c
arch/x86/kernel/process.c