tree 0cf2202a8ec37e134c2507907d4b9a8d5f9460e8
parent bdbff71653db2da9c69ff29a02764c388649d08d
parent 2421ad48f4aed63bc890e8f3c53ed581a542fb66
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1382096530 +0200
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1382096530 +0200

Merge branch 'acpi-fixes'

* acpi-fixes:
  ACPI / PM: Drop two functions that are not used any more
  ATA / ACPI: remove power dependent device handling
  ACPI / power: Drop automaitc resume of power resource dependent devices
  ACPI: remove /proc/acpi/event from ACPI_BUTTON help
  ACPI / power: Release resource_lock after acpi_power_get_state() return error