Dave Jones c4366889dd Merge ../linus ...

Conflicts:

	drivers/cpufreq/cpufreq.c

2006-12-12 17:41:41 -05:00

..

amd-powernow.txt

…

core.txt

…

cpu-drivers.txt

…

cpufreq-nforce2.txt

…

cpufreq-stats.txt

…

governors.txt

…

index.txt

…

user-guide.txt

…