projects / platform / adaptation / renesas_rcar / renesas_kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
* 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

1  2 
drivers/acpi/sleep.c patch | diff1 | diff2 | blob | history
drivers/pnp/pnpacpi/core.c patch | diff1 | diff2 | blob | history

diff --cc drivers/acpi/sleep.c
Simple merge
diff --cc drivers/pnp/pnpacpi/core.c
Simple merge
Domain: System / Uncategorized;