Merge branch 'linus' into x86/timers
authorIngo Molnar <mingo@elte.hu>
Mon, 16 Jun 2008 09:20:57 +0000 (11:20 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 16 Jun 2008 09:20:57 +0000 (11:20 +0200)
1  2 
arch/x86/kernel/tsc_32.c
arch/x86/kernel/tsc_64.c

Simple merge
Simple merge