]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
Merge branch 'linus' into x86/timers
authorIngo Molnar <mingo@elte.hu>
Wed, 25 Jun 2008 10:36:55 +0000 (12:36 +0200)
committerIngo Molnar <mingo@elte.hu>
Wed, 25 Jun 2008 10:36:55 +0000 (12:36 +0200)
1  2 
arch/x86/kernel/tsc_32.c

Simple merge