projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8fbcf5e bac2a90 39909b7)
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)
* 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

1  2  3 
drivers/pci/pci.c patch | diff1 | diff2 | diff3 | blob | history
drivers/pci/pci.h patch | diff1 | diff2 | diff3 | blob | history

diff --cc drivers/pci/pci.c
Simple merge
diff --cc drivers/pci/pci.h
Simple merge
John Crispins staging tree