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

diff --cc fs/proc/array.c
index 9cbab7e93557693dce3e83c6d4b3f8c2b3a6c2c6,4cb81776a7ffd4f2d2f52b6c440ff1ce61f31091..965625a0977d4de5395c74eb74247d3785189425
--- 1/fs/proc/array.c
--- 2/fs/proc/array.c
+++ b/fs/proc/array.c
@@@ -289,18 -289,9 +289,18 @@@ static inline char *task_cap(struct tas
                            cap_t(p->cap_effective));
  }
  
- int proc_pid_status(struct task_struct *task, char * buffer)
 +static inline char *task_context_switch_counts(struct task_struct *p,
 +                                              char *buffer)
 +{
 +      return buffer + sprintf(buffer, "voluntary_ctxt_switches:\t%lu\n"
 +                          "nonvoluntary_ctxt_switches:\t%lu\n",
 +                          p->nvcsw,
 +                          p->nivcsw);
 +}
 +
+ int proc_pid_status(struct task_struct *task, char *buffer)
  {
-       char * orig = buffer;
+       char *orig = buffer;
        struct mm_struct *mm = get_task_mm(task);
  
        buffer = task_name(task, buffer);