From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Tue, 10 Feb 2015 15:07:10 +0000 (+0100)
Subject: Merge branches 'pm-pci' and 'pm-cpuidle'
X-Git-Tag: firefly_0821_release~176^2~2381^2~5
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2f8c42f31c9352c9ab9e70616342d585d3c2b735;p=firefly-linux-kernel-4.4.55.git

Merge branches 'pm-pci' and 'pm-cpuidle'

* pm-pci:
  PCI / PM: Avoid resuming PCI devices during system suspend

* pm-cpuidle:
  drivers: cpuidle: Don't initialize big.LITTLE driver if MCPM is unavailable
---

2f8c42f31c9352c9ab9e70616342d585d3c2b735