tree cf62a4a8c5197d0d205b093dd1f764114bae1aeb
parent 4fc09385c79fa95e97365d33de9b4e046d680b94
author Thomas Gleixner <tglx@linutronix.de> 1185471679 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1185474920 -0700

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>