Merge branches 'pm-pci' and 'pm-cpuidle'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 10 Feb 2015 15:07:10 +0000 (16:07 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 10 Feb 2015 15:07:10 +0000 (16:07 +0100)
commit2f8c42f31c9352c9ab9e70616342d585d3c2b735
treec1a81dbd29c64a077bf3832d9b80fb19dd242c1c
parent8fbcf5ecb336eb6da560f08d60e95b51d318795c
parentbac2a909a096c9110525c18cbb8ce73c660d5f71
parent39909b7114425fa390ee8e2f22477bf4679f8cf3
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
drivers/pci/pci.c
drivers/pci/pci.h