]> err.no Git - linux-2.6/commit
projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: add0969 8ea0260)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 16 Jul 2007 18:02:49 +0000 (11:02 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 16 Jul 2007 18:02:49 +0000 (11:02 -0700)
commit10b275ddfd05ccb414cfe0cc56a0f47ff20fe807
tree22547c4df78a575194522fc0ecc01b9e54439d09tree | snapshot
parentadd096909da63ef32d6766f6771c07c9f16c6ee5commit | diff
parent8ea02606681beb41568c62ba060bdf51fc9ba14ecommit | diff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched

* git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched:
  [PATCH] sched: fix up fs/proc/array.c whitespace problems
  [PATCH] sched: prettify prio_to_wmult[]
  [PATCH] sched: document prio_to_wmult[]
  [PATCH] sched: improve weight-array comments
  [PATCH] sched: remove dead code from task_stime()

Fixed up trivial conflict in fs/proc/array.c
fs/proc/array.c diff1 | diff2 | blob | history
Linux 2.6 source tree