From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 4 Dec 2015 13:01:02 +0000 (+0100)
Subject: Merge branches 'acpi-pci' and 'pm-pci'
X-Git-Tag: v4.4-rc4~12^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c09c9dd2e9c732658c744a802101d5c34fedde22;p=thirdparty%2Flinux.git

Merge branches 'acpi-pci' and 'pm-pci'

* acpi-pci:
  x86/PCI/ACPI: Fix regression caused by commit 4d6b4e69a245

* pm-pci:
  PCI / PM: Tune down retryable runtime suspend error messages
---

c09c9dd2e9c732658c744a802101d5c34fedde22