tree 63f5ff1017bab3d3c50ef48761167fb90b9fcf46
parent bdc5663fa14de657f24080ee959670d49c8dd094
parent 7e3115ef5149fc502e3a2e80719dba54a8e7409d
author Linus Torvalds <torvalds@linux-foundation.org> 1380140925 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1380140925 -0700

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 small fixes"

* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched/balancing: Fix cfs_rq->task_h_load calculation
  sched/balancing: Fix 'local->avg_load > busiest->avg_load' case in fix_small_imbalance()
  sched/balancing: Fix 'local->avg_load > sds->avg_load' case in calculate_imbalance()