]> www.infradead.org Git - users/hch/xfs.git/commitdiff
projects / users / hch / xfs.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 62839e2 8c01275 2165747 584d8d1 e58d154)
Merge branches 'acpi-osl', 'acpi-pad', 'acpi-video' and 'acpi-assorted'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 1 Nov 2015 23:51:46 +0000 (00:51 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 1 Nov 2015 23:51:46 +0000 (00:51 +0100)
* acpi-osl:
  ACPI / PM: Fix incorrect wakeup IRQ setting during suspend-to-idle
  ACPI: Using correct irq when waiting for events
  ACPI: Use correct IRQ when uninstalling ACPI interrupt handler

* acpi-pad:
  ACPI / PAD: power_saving_thread() is not freezable

* acpi-video:
  ACPI / video: Add a quirk to force native backlight on Lenovo IdeaPad S405

* acpi-assorted:
  ACPI / Documentation: add copy_dsdt to ACPI format options
  ACPI / sysfs: correctly check failing memory allocation

1  2  3  4  5 
drivers/acpi/osl.c patch | diff1 | diff2 | diff3 | diff4 | diff5 | blob | history
include/linux/acpi.h patch | diff1 | diff2 | diff3 | diff4 | diff5 | blob | history

diff --cc drivers/acpi/osl.c
Simple merge
diff --cc include/linux/acpi.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.