aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-06-19 01:16:21 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-06-19 01:16:21 +0200
commit4f1fd900c2bd0bf36832d489745b5f78847a1534 (patch)
treed77329161fc4b2d0b5cf056362275bedba87fd1e /drivers/acpi
parentMerge branches 'acpi-init', 'acpi-pnp', 'acpi-scan', 'acpi-proc' and 'acpi-doc' (diff)
parentACPI / PM: Add missing pm_generic_complete() invocation (diff)
parentMerge tag 'ras_for_4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras into acpi-apei (diff)
parentACPI / osl: use same type for acpi_predefined_names values as in definition (diff)
parentMerge back earlier 'acpi-pci' material for v4.2. (diff)
downloadlinux-dev-4f1fd900c2bd0bf36832d489745b5f78847a1534.tar.xz
linux-dev-4f1fd900c2bd0bf36832d489745b5f78847a1534.zip
Merge branches 'acpi-pm', 'acpi-apei', 'acpi-osl' and 'acpi-pci'
* acpi-pm: ACPI / PM: Add missing pm_generic_complete() invocation ACPI / PM: Turn power resources on and off in the right order during resume ACPI / PM: Rework device power management to follow ACPI 6 ACPI / PM: Drop stale comment from acpi_power_transition() * acpi-apei: GHES: Make NMI handler have a single reader GHES: Elliminate double-loop in the NMI handler GHES: Panic right after detection GHES: Carve out the panic functionality GHES: Carve out error queueing in a separate function * acpi-osl: ACPI / osl: use same type for acpi_predefined_names values as in definition * acpi-pci: ACPI / PCI: remove stale list_head in struct acpi_prt_entry