summaryrefslogtreecommitdiff
path: root/drivers/pci/pci.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-02-10 18:07:10 +0300
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-02-10 18:07:10 +0300
commit2f8c42f31c9352c9ab9e70616342d585d3c2b735 (patch)
treec1a81dbd29c64a077bf3832d9b80fb19dd242c1c /drivers/pci/pci.c
parent8fbcf5ecb336eb6da560f08d60e95b51d318795c (diff)
parentbac2a909a096c9110525c18cbb8ce73c660d5f71 (diff)
parent39909b7114425fa390ee8e2f22477bf4679f8cf3 (diff)
downloadlinux-2f8c42f31c9352c9ab9e70616342d585d3c2b735.tar.xz
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