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)
commit934a3595b30c986bab52bc9c08d12c8962c88c8a
tree1aa2acda1b45d97ce7b4027327a23a2a3c8dc81a
parentb4d9eda028e8becbb5057b554e63eea12e496a88
parent7d5e350fab47f1273bc8b52d5f133ed6e4baeb7f
Merge /pub/scm/linux/kernel/git/davej/cpufreq
arch/i386/kernel/timers/timer_tsc.c