]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'acpi-dev-pm-next' into linux-next
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sat, 10 Nov 2012 21:49:14 +0000 (22:49 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sat, 10 Nov 2012 21:49:14 +0000 (22:49 +0100)
* acpi-dev-pm-next:
  ACPI / PM: Fix build problem related to acpi_target_system_state()

1  2 
include/acpi/acpi_bus.h

Simple merge