]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 10809bb a64a62c)
Merge branch 'acpi-ec' into acpi
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 30 Nov 2017 12:37:29 +0000 (13:37 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 30 Nov 2017 12:37:29 +0000 (13:37 +0100)
* acpi-ec:
  ACPI / EC: Fix regression related to PM ops support in ECDT device

1  2 
drivers/acpi/ec.c patch | diff1 | diff2 | blob | history
drivers/acpi/internal.h patch | diff1 | diff2 | blob | history
drivers/acpi/scan.c patch | diff1 | diff2 | blob | history
include/acpi/acpi_bus.h patch | diff1 | diff2 | blob | history

diff --cc drivers/acpi/ec.c
Simple merge
diff --cc drivers/acpi/internal.h
Simple merge
diff --cc drivers/acpi/scan.c
Simple merge
diff --cc include/acpi/acpi_bus.h
Simple merge
local clone of linux.git