From: Thomas Gleixner <tglx@linutronix.de>
Date: Thu, 26 Jul 2007 17:41:19 +0000 (-0700)
Subject: x86_64: cleanup tsc.c merge artifact
X-Git-Tag: v2.6.23-rc2~197
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8ec3cf7d29aef773eee5bc6cd9b0fa4d3fb42480;p=pandora-kernel.git

x86_64: cleanup tsc.c merge artifact

tsc_unstable is declared twice.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

Reading git-diff-tree failed