Pull bugzilla-5737 into release branch

author Len Brown <[email protected]>

Fri, 16 Jun 2006 01:39:25 +0000 (21:39 -0400)

committer Len Brown <[email protected]>

Fri, 16 Jun 2006 01:39:25 +0000 (21:39 -0400)
author Len Brown <[email protected]>
Fri, 16 Jun 2006 01:39:25 +0000 (21:39 -0400)
committer Len Brown <[email protected]>
Fri, 16 Jun 2006 01:39:25 +0000 (21:39 -0400)
diff --cc arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c
Simple merge
diff --cc drivers/acpi/processor_perflib.c
Simple merge
author	Len Brown <[email protected]>
	Fri, 16 Jun 2006 01:39:25 +0000 (21:39 -0400)
committer	Len Brown <[email protected]>
	Fri, 16 Jun 2006 01:39:25 +0000 (21:39 -0400)
		1	2
arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/acpi/processor_perflib.c	patch \|	diff1 \|	diff2 \|	blob \| history