]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'acpi-fixes'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 23 May 2013 08:33:44 +0000 (10:33 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 23 May 2013 08:33:44 +0000 (10:33 +0200)
* acpi-fixes:
  ACPI / video: Add "Asus UL30A" to ACPI video detect blacklist
  ACPI / PM: Allow device power states to be used for CONFIG_PM unset


Trivial merge