Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 8 Jul 2016 16:04:34 +0000 (09:04 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 8 Jul 2016 16:04:34 +0000 (09:04 -0700)
commitf1cf8c874849bf42054130aa146d18d5e12ab9df
tree6f61b228432aa12c166722fe7d3da2694e8a760d
parentcf88f92d34cf7ab96e919d7f4dca4654dbb287f3
parentf6ab361f41e943f6e63a150d1f107b56a8fa9b07
Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull scheduler fixes from Ingo Molnar:
 "Two load-balancing fixes for cgroups-intense workloads"

* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched/fair: Fix calc_cfs_shares() fixed point arithmetics width confusion
  sched/fair: Fix effective_load() to consistently use smoothed load