Pull bugzilla-5737 into release branch
authorLen Brown <len.brown@intel.com>
Fri, 16 Jun 2006 01:39:25 +0000 (21:39 -0400)
committerLen Brown <len.brown@intel.com>
Fri, 16 Jun 2006 01:39:25 +0000 (21:39 -0400)
commitd42510a0f58c2583c37c8e9b7548e3a68545863a
tree9d44b95405b9f0083e911a66cc5512860293f95a
parent8f2ddb37e564a9616c05fa0d5652e0049072a730
parent193de0c79da580eb33a66113b62e2378fc1fb629
Pull bugzilla-5737 into release branch

Conflicts:

arch/x86_64/kernel/acpi/processor.c
arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c
drivers/acpi/processor_perflib.c