Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 19 Oct 2007 19:07:03 +0000 (12:07 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 19 Oct 2007 19:07:03 +0000 (12:07 -0700)
commitec2626815bf9a9922e49820b03e670e833f3ca3c
treec1d6ff9559a62c5636adaae7a6c7cac397762f42
parent0a4908e19fd016d60403fc76cf38b2d08d21e2d2
parentf9e26291be31cb494c1845e356daba84b39ab059
Merge git://git./linux/kernel/git/mingo/linux-2.6-sched

* git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched:
  sched: fix guest time accounting going faster than user time accounting
fs/proc/array.c