]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
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)
Conflicts:

arch/x86_64/kernel/acpi/processor.c

1  2 
arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c
drivers/acpi/processor_perflib.c

Simple merge