From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Tue, 4 Dec 2012 12:46:08 +0000 (+0100)
Subject: Merge branch 'acpi-general'
X-Git-Tag: firefly_0821_release~3680^2~1523^2~5
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6b728f1a906976ec658827adc9c2d27608aa8517;p=firefly-linux-kernel-4.4.55.git

Merge branch 'acpi-general'

* acpi-general:
  ACPI / PNP: Do not crash due to stale pointer use during system resume
  ACPI / video: Add "Asus UL30VT" to ACPI video detect blacklist
  ACPI: do acpisleep dmi check when CONFIG_ACPI_SLEEP is set
---

6b728f1a906976ec658827adc9c2d27608aa8517