projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 4fc0938) | patch
x86_64: cleanup tsc.c merge artifact
authorThomas Gleixner <tglx@linutronix.de>
Thu, 26 Jul 2007 17:41:19 +0000 (10:41 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 26 Jul 2007 18:35:20 +0000 (11:35 -0700)
commit8ec3cf7d29aef773eee5bc6cd9b0fa4d3fb42480
treecf62a4a8c5197d0d205b093dd1f764114bae1aebtree | snapshot
parent4fc09385c79fa95e97365d33de9b4e046d680b94commit | diff
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>
arch/x86_64/kernel/tsc.c diff | blob | history
John Crispins staging tree