Merge commit 'v2.6.34-rc6' into x86/cpu
commitd7be0ce6afb1df60bc786f57410407ceae92b994
authorH. Peter Anvin <hpa@zytor.com>
Sat, 8 May 2010 21:59:58 +0000 (8 14:59 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Sat, 8 May 2010 21:59:58 +0000 (8 14:59 -0700)
tree5e91acfc12c833531ad3320f274e0cd96a129973
parente08cae4181af9483b04ecfac48f01c8e5a5f27bf
parent66f41d4c5c8a5deed66fdcc84509376c9a0bf9d8
Merge commit 'v2.6.34-rc6' into x86/cpu
arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
arch/x86/kernel/cpu/intel.c
arch/x86/kernel/cpu/vmware.c
drivers/cpufreq/cpufreq.c
drivers/cpufreq/cpufreq_conservative.c