summaryrefslogtreecommitdiffstats
path: root/include/acpi
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-11-13 01:37:55 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-11-13 01:37:55 +0100
commiteb5fcc3134b5375593de5325ddf4b1404b36b602 (patch)
treeb5f330a2c3aeb664ca9a2cd50ea140575268270e /include/acpi
parent85595ada6c8f0c94d4d715db90c807d7baefb1c5 (diff)
parent53c5eaabaea9a1b7a96f95ccc486d2ad721d95bb (diff)
parent84d3f6b76447896919c63b28ad71f71238cefcce (diff)
parent3e87ead41224fca9dbc3c8646b5cff8168348aba (diff)
parent71c50dbe1f4e5b964786e3680f4b92df9ccc630b (diff)
parent85b1407bf6d2f4a1583e9201b8c163703df733cc (diff)
downloadlinux-eb5fcc3134b5375593de5325ddf4b1404b36b602.tar.gz
linux-eb5fcc3134b5375593de5325ddf4b1404b36b602.tar.bz2
linux-eb5fcc3134b5375593de5325ddf4b1404b36b602.zip
Merge branches 'acpi-ec', 'acpi-button', 'acpi-sysfs', 'acpi-lpss' and 'acpi-cppc'
* acpi-ec: ACPI / EC: Fix regression related to triggering source of EC event handling * acpi-button: ACPI / button: Delay acpi_lid_initialize_state() until first user space open * acpi-sysfs: ACPI / sysfs: Make function param_set_trace_method_name() static * acpi-lpss: ACPI / LPSS: Remove redundant initialization of clk * acpi-cppc: ACPI / CPPC: Make CPPC ACPI driver aware of PCC subspace IDs mailbox: PCC: Move the MAX_PCC_SUBSPACES definition to header file