Merge commit 'v2.6.34-rc6' into x86/cpu

2010-05-08 14:59:58 -07:00
parent e08cae4181 66f41d4c5c
commit d7be0ce6af
4946 changed files with 36643 additions and 9956 deletions
--- a/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
+++ b/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
@@ -33,6 +33,7 @@
 #include <linux/cpufreq.h>
 #include <linux/compiler.h>
 #include <linux/dmi.h>
+#include <linux/slab.h>
 #include <trace/events/power.h>

 #include <linux/acpi.h>