Merge branches 'acpi', 'idle', 'mrst-pmu' and 'pm-tools' into next

This commit is contained in:
Len Brown
2011-11-06 22:14:50 -05:00
18 changed files with 669 additions and 349 deletions

View File

@ -329,6 +329,7 @@ extern void acpi_processor_throttling_init(void);
int acpi_processor_power_init(struct acpi_processor *pr,
struct acpi_device *device);
int acpi_processor_cst_has_changed(struct acpi_processor *pr);
int acpi_processor_hotplug(struct acpi_processor *pr);
int acpi_processor_power_exit(struct acpi_processor *pr,
struct acpi_device *device);
int acpi_processor_suspend(struct acpi_device * device, pm_message_t state);