summaryrefslogtreecommitdiffstats
path: root/include/acpi
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-09-25 22:59:30 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-09-25 22:59:30 +0200
commit9ef5a306ef1bc5a434030f3a70b23170bc0ca773 (patch)
treeb059557727db7d6d08a81c6533670199db8d94f3 /include/acpi
parent8ab17fc92e49bc2b8fff9d220c19bf50ec9c1158 (diff)
parent98d28d0e59160d2d6cb3f6a9050723ac40f89669 (diff)
parent457920817e645a7dee42c2a75c81c5ed8e12ee1c (diff)
parentc15d821ddb9dac9ac6b5beb75bf942f3bc3a4004 (diff)
parent789eeea128925741e0a105357bebf8855d3bcdee (diff)
downloadlinux-9ef5a306ef1bc5a434030f3a70b23170bc0ca773.tar.gz
linux-9ef5a306ef1bc5a434030f3a70b23170bc0ca773.tar.bz2
linux-9ef5a306ef1bc5a434030f3a70b23170bc0ca773.zip
Merge branches 'acpi-hotplug', 'acpi-scan', 'acpi-lpss', 'acpi-gpio' and 'acpi-video'
* 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