From: Ingo Molnar <mingo@elte.hu>
Date: Thu, 25 Dec 2008 11:48:18 +0000 (+0100)
Subject: Merge branch 'x86/tsc' into tracing/core
X-Git-Tag: v2.6.29-rc1~586^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a3eeeefbf1cd1d142c52238cc19c75d14c3bc8d5;p=pandora-kernel.git

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
---

a3eeeefbf1cd1d142c52238cc19c75d14c3bc8d5
Reading git-diff-tree failed