projects / platform / adaptation / renesas_rcar / renesas_kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fbb9c10 42b946b 2d4054d ec9c9c2 b981513 5c551e6)
Merge branches 'acpi-gpe', 'acpi-video', 'acpi-thermal', 'acpi-processor', 'acpi...
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 12 Jan 2014 22:46:55 +0000 (23:46 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 12 Jan 2014 22:46:55 +0000 (23:46 +0100)
* acpi-gpe:
  ACPI / EC: disable GPE before removing GPE handler
  ACPI / Button: Fix enabling button GPEs twice

* acpi-video:
  ACPI: Blacklist Win8 OSI for some HP laptop 2013 models
  ACPI / video: Fix typo in video_detect.c

* acpi-thermal:
  ACPI / thermal: remove const from thermal_zone_device_ops declaration

* acpi-processor:
  ACPI / scan: bail out early if failed to parse APIC ID for CPU

* acpi-sleep:
  ACPI / sleep: remove panic in case hardware has changed after S4

1  2  3  4  5  6 
drivers/acpi/acpi_processor.c patch | diff1 | diff2 | diff3 | diff4 | diff5 | diff6 | blob | history
drivers/acpi/blacklist.c patch | diff1 | diff2 | diff3 | diff4 | diff5 | diff6 | blob | history
drivers/acpi/button.c patch | diff1 | diff2 | diff3 | diff4 | diff5 | diff6 | blob | history
drivers/acpi/ec.c patch | diff1 | diff2 | diff3 | diff4 | diff5 | diff6 | blob | history
drivers/acpi/sleep.c patch | diff1 | diff2 | diff3 | diff4 | diff5 | diff6 | blob | history
drivers/acpi/thermal.c patch | diff1 | diff2 | diff3 | diff4 | diff5 | diff6 | blob | history

diff --cc drivers/acpi/acpi_processor.c
Simple merge
diff --cc drivers/acpi/blacklist.c
Simple merge
diff --cc drivers/acpi/button.c
Simple merge
diff --cc drivers/acpi/ec.c
Simple merge
diff --cc drivers/acpi/sleep.c
Simple merge
diff --cc drivers/acpi/thermal.c
Simple merge
Domain: System / Uncategorized;