git.samba.org / sfrench / cifs-2.6.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d9ba102 a6b5e88)
Merge branch 'acpi-general'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 4 Dec 2012 12:46:08 +0000 (13:46 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 4 Dec 2012 12:46:08 +0000 (13:46 +0100)
commit6b728f1a906976ec658827adc9c2d27608aa8517
treeb60bef25c8258b7b250f1d57ac0722cd742b3c96tree
parentd9ba1025a46d368bc00a2981cb2b2a918e9209b7commit | diff
parenta6b5e88c0e42093b9057856f35770966c8c591e3commit | diff
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
drivers/acpi/sleep.c diff1 | diff2 | blob | history
drivers/pnp/pnpacpi/core.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.