Merge branches 'acpi_pad', 'acpica', 'apei-bugzilla-43282', 'battery', 'cpuidle-coupled', 'cpuidle-tweaks', 'intel_idle-ivb', 'ost', 'red-hat-bz-772730', 'thermal', 'thermal-spear' and 'turbostat-v2' into release

This commit is contained in:
1437 changed files with 17253 additions and 9607 deletions

View File

@@ -143,7 +143,7 @@ void __init acpi_old_suspend_ordering(void)
static int acpi_pm_freeze(void)
{
acpi_disable_all_gpes();
acpi_os_wait_events_complete(NULL);
acpi_os_wait_events_complete();
acpi_ec_block_transactions();
return 0;
}