Merge branches 'release' and 'throttling-domains' into release

2008-02-07 03:30:48 -05:00
parent 52b097fff8 3391a76f2b
commit 8976b6fd7a
5 changed files with 358 additions and 8 deletions
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@ -1091,6 +1091,8 @@ static int __init acpi_processor_init(void)

 	acpi_processor_ppc_init();

+	acpi_processor_throttling_init();
+
 	return 0;

 out_cpuidle: