]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 17 Dec 2013 20:35:54 +0000 (12:35 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 17 Dec 2013 20:35:54 +0000 (12:35 -0800)
commitdd0508093b79141e0044ca02f0acb6319f69f546
tree5e0116949fd98cfaee9b118b6637203d17fa5dd0
parent1070d5ac193af55fd335ef2aacaf03c5fc4ee461
parent9dbdb155532395ba000c5d5d187658b0e17e529f
Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull scheduler fixes from Ingo Molnar:
 "Three fixes for scheduler crashes, each triggers in relatively rare,
  hardware environment dependent situations"

* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched/fair: Rework sched_fair time accounting
  math64: Add mul_u64_u32_shr()
  sched: Remove PREEMPT_NEED_RESCHED from generic code
  sched: Initialize power_orig for overlapping groups