diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2012-12-04 13:46:08 +0100 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2012-12-04 13:46:08 +0100 |
commit | 6b728f1a906976ec658827adc9c2d27608aa8517 (patch) | |
tree | b60bef25c8258b7b250f1d57ac0722cd742b3c96 /scripts | |
parent | Merge branch 'acpi-enumeration' (diff) | |
parent | ACPI / PNP: Do not crash due to stale pointer use during system resume (diff) | |
download | linux-6b728f1a906976ec658827adc9c2d27608aa8517.tar.xz linux-6b728f1a906976ec658827adc9c2d27608aa8517.zip |
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
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions