Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 19 Jul 2014 16:26:43 +0000 (06:26 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 19 Jul 2014 16:26:43 +0000 (06:26 -1000)
commitd1743b810d7a306d1dd837e086d18124bc38b575
tree30e33a166f2f501a1e6ac0be96c0636d98d16711
parentcb20fd0779add7c5b6dd7ca6f5e2aa2c0d06803f
parentb0ab99e7736af88b8ac1b7ae50ea287fffa2badc
Merge branch 'sched-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

Pull scheduler fix from Thomas Gleixner:
 "Prevent a possible divide by zero in the debugging code"

* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched: Fix possible divide by zero in avg_atom() calculation