| commit | 10b275ddfd05ccb414cfe0cc56a0f47ff20fe807 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Mon Jul 16 11:02:49 2007 -0700 |
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Mon Jul 16 11:02:49 2007 -0700 |
| tree | 22547c4df78a575194522fc0ecc01b9e54439d09 | |
| parent | add096909da63ef32d6766f6771c07c9f16c6ee5 [diff] | |
| parent | 8ea02606681beb41568c62ba060bdf51fc9ba14e [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