]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
projects / mirror_ubuntu-kernels.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a99cde4 dbd1b8e 65c0554)
Merge branches 'pm-cpuidle-fixes' and 'pm-sleep-fixes'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 7 Jul 2016 21:17:20 +0000 (23:17 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 7 Jul 2016 21:17:20 +0000 (23:17 +0200)
* pm-cpuidle-fixes:
  cpuidle: Fix last_residency division

* pm-sleep-fixes:
  x86/power/64: Fix kernel text mapping corruption during image restoration


Trivial merge
Ubuntu combined Linux kernel mirror