From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 23 May 2013 08:33:44 +0000 (+0200)
Subject: Merge branch 'acpi-fixes'
X-Git-Tag: v3.10-rc3~7^2~1
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=f1a0b8310c99a0e3d579e61d81870caec058db46;p=linux-2.6-block.git

Merge branch 'acpi-fixes'

* 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
---

f1a0b8310c99a0e3d579e61d81870caec058db46