Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq (9283dfed) · Commits · 戴 / test

Documentation/cpu-freq/index.txt

+4 −6

Original line number	Original line	Diff line number	Diff line
	@@ -35,11 +35,9 @@ Mailing List
	------------		------------
	There is a CPU frequency changing CVS commit and general list where		There is a CPU frequency changing CVS commit and general list where
	you can report bugs, problems or submit patches. To post a message,		you can report bugs, problems or submit patches. To post a message,
	send an email to cpufreq@lists.linux.org.uk, to subscribe go to		send an email to cpufreq@vger.kernel.org, to subscribe go to
	http://lists.linux.org.uk/mailman/listinfo/cpufreq. Previous post to the		http://vger.kernel.org/vger-lists.html#cpufreq and follow the
	mailing list are available to subscribers at		instructions there.
	http://lists.linux.org.uk/mailman/private/cpufreq/.


	Links		Links
	-----		-----
	@@ -50,7 +48,7 @@ how to access the CVS repository:
	* http://cvs.arm.linux.org.uk/		* http://cvs.arm.linux.org.uk/

	the CPUFreq Mailing list:		the CPUFreq Mailing list:
	* http://lists.linux.org.uk/mailman/listinfo/cpufreq		* http://vger.kernel.org/vger-lists.html#cpufreq

	Clock and voltage scaling for the SA-1100:		Clock and voltage scaling for the SA-1100:
	* http://www.lartmaker.nl/projects/scaling		* http://www.lartmaker.nl/projects/scaling

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -171,7 +171,7 @@ static unsigned int cpufreq_p4_get_frequency(struct cpuinfo_x86 *c)
	}		}

	if (c->x86 != 0xF) {		if (c->x86 != 0xF) {
	printk(KERN_WARNING PFX "Unknown p4-clockmod-capable CPU. Please send an e-mail to <cpufreq@lists.linux.org.uk>\n");		printk(KERN_WARNING PFX "Unknown p4-clockmod-capable CPU. Please send an e-mail to <cpufreq@vger.kernel.org>\n");
	return 0;		return 0;
	}		}

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -26,7 +26,7 @@
	#include <asm/cpufeature.h>		#include <asm/cpufeature.h>

	#define PFX "speedstep-centrino: "		#define PFX "speedstep-centrino: "
	#define MAINTAINER "cpufreq@lists.linux.org.uk"		#define MAINTAINER "cpufreq@vger.kernel.org"

	#define dprintk(msg...) \		#define dprintk(msg...) \
	cpufreq_debug_printk(CPUFREQ_DEBUG_DRIVER, "speedstep-centrino", msg)		cpufreq_debug_printk(CPUFREQ_DEBUG_DRIVER, "speedstep-centrino", msg)