]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branches 'acpi-hotplug', 'acpi-scan', 'acpi-lpss', 'acpi-gpio' and 'acpi-video'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 25 Sep 2014 20:59:30 +0000 (22:59 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 25 Sep 2014 20:59:30 +0000 (22:59 +0200)
* acpi-hotplug:
  ACPI / hotplug: Generate online uevents for ACPI containers

* acpi-scan:
  ACPI / scan: Correct error return value of create_modalias()

* acpi-lpss:
  ACPI / platform / LPSS: disable async suspend/resume of LPSS devices

* acpi-gpio:
  gpio / ACPI: Use pin index and bit length
  ACPICA: Update to GPIO region handler interface.

* acpi-video:
  ACPI / video: disable native backlight for ThinkPad X201s

1  2  3  4  5 
drivers/acpi/scan.c
include/acpi/acpi_bus.h

Simple merge
Simple merge