From: Rafael J. Wysocki Date: Thu, 18 Jun 2015 23:16:21 +0000 (+0200) Subject: Merge branches 'acpi-pm', 'acpi-apei', 'acpi-osl' and 'acpi-pci' X-Git-Tag: omap-for-v4.2/fixes-rc1^2~154^2~14 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f1fd900c2bd0bf36832d489745b5f78847a1534;p=pandora-kernel.git 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 --- 4f1fd900c2bd0bf36832d489745b5f78847a1534 Reading git-diff-tree failed