summaryrefslogtreecommitdiff
path: root/drivers/pnp/isapnp
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2012-12-04 12:46:08 (GMT)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2012-12-04 12:46:08 (GMT)
commit6b728f1a906976ec658827adc9c2d27608aa8517 (patch)
treeb60bef25c8258b7b250f1d57ac0722cd742b3c96 /drivers/pnp/isapnp
parentd9ba1025a46d368bc00a2981cb2b2a918e9209b7 (diff)
parenta6b5e88c0e42093b9057856f35770966c8c591e3 (diff)
downloadlinux-fsl-qoriq-6b728f1a906976ec658827adc9c2d27608aa8517.tar.xz
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 'drivers/pnp/isapnp')
0 files changed, 0 insertions, 0 deletions