Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 27 Nov 2007 03:42:08 +0000 (19:42 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 27 Nov 2007 03:42:08 +0000 (19:42 -0800)
commit0685ab4fb8e527639d9867df60d49dccba85d842
tree7d7db22548b95da9555afec2889a9e8efa2053d9
parentff1ea52fa317a5658b6415b25169c5e531f54876
parentf7b9329e556a8bdb9e07292cddbbe484c7a2b8c5
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: bump version of kernel/sched_debug.c
  sched: fix minimum granularity tunings
  sched: fix RLIMIT_CPU comment
  sched: fix kernel/acct.c comment
  sched: fix prev_stime calculation
  sched: don't forget to unlock uids_mutex on error paths