Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 30 Nov 2008 21:06:47 +0000 (13:06 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 30 Nov 2008 21:06:47 +0000 (13:06 -0800)
commit9bd062d9eaf9e790330f37d9f4518e1b95131f6c
treea209a707eddf645bdeed3e9c82603ead64eea515
parent72244c0e68dd664b894adb34a8772a6e4673b4c1
parentaf6d596fd603219b054c1c90fb16672a9fd441bd
Merge branch 'sched-fixes-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  sched: prevent divide by zero error in cpu_avg_load_per_task, update
  sched, cpusets: fix warning in kernel/cpuset.c
  sched: prevent divide by zero error in cpu_avg_load_per_task