Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 14 Feb 2006 03:10:43 +0000 (19:10 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 14 Feb 2006 03:10:43 +0000 (19:10 -0800)
1  2 
arch/i386/kernel/timers/timer_tsc.c

Simple merge