]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7b985c1 41e4b89)
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)
commit41baabb7093aad37fecf74472f17b09b117ae76b
tree22547c4df78a575194522fc0ecc01b9e54439d09tree | snapshot
parent7b985c166f504aecdabe261f4584c0a7dbff6b01commit | diff
parent41e4b890fe88fcbade7b2c3129d49dc4aa9a2702commit | 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 Kernel Source Tree.