Merge branch 'acpi-fan'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 17 Mar 2014 12:48:25 +0000 (13:48 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 17 Mar 2014 12:48:25 +0000 (13:48 +0100)
commitc730d30c313a24d9f8829cd2a4047c3eb8b89fec
treeee8aeb498a64bd20488960cb380733f31c08ec38
parent2eb060975df2aaca635801dcfb99eaa45ede98fe
parentb9b8515f34fa182e26ee934c3a83f24e2d8bd846
Merge branch 'acpi-fan'

* acpi-fan:
  ACPI / fan: do nothing in suspend and poweroff callback