Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 7 Nov 2005 21:28:20 +0000 (13:28 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 7 Nov 2005 21:28:20 +0000 (13:28 -0800)
commitdad2ad82c5f058367df79de022bd12d36afcd065
tree426a1a6ca8762356b375527768bedc2de0bd25e9
parent7079060f3e86ea4c1d4e9c1e356592ef9dcaaa1f
parentb7fb358c7c36a14927d5523ea674e69f90c51d1d
Merge /pub/scm/linux/kernel/git/davej/cpufreq
arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
arch/i386/kernel/cpu/cpufreq/powernow-k8.c
arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c
drivers/cpufreq/cpufreq.c
drivers/cpufreq/cpufreq_stats.c