]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'acpi-fixes-next' into linux-next
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 17 Oct 2013 13:46:35 +0000 (15:46 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 17 Oct 2013 13:46:35 +0000 (15:46 +0200)
commit259b6151e7dfee7062bdef2a8823b2696c9b938c
tree603f11ddad2e909a2a907d70e221eddfa51f15fd
parent7715f01c1760bc2084a5c6b5c0cce7ef5fc7999d
parent2421ad48f4aed63bc890e8f3c53ed581a542fb66
Merge branch 'acpi-fixes-next' into linux-next

* acpi-fixes-next:
  ACPI / PM: Drop two functions that are not used any more
  ATA / ACPI: remove power dependent device handling
drivers/acpi/device_pm.c
include/acpi/acpi_bus.h