]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit9167a687051eb85875c6334667274c32696c4afa
treec1a81dbd29c64a077bf3832d9b80fb19dd242c1c
parent18a862d79d755cad46aac93a9c30b1a944068d51
parent4699c042045b9662d2ee05ed7667f507d58bb3f0
parentb9b3e9cb40cf681a10f06712edff6cc39e19b9d7
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