From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Mon, 16 Jul 2007 18:02:49 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched
X-Git-Tag: v2.6.23-rc1~780
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=10b275ddfd05ccb414cfe0cc56a0f47ff20fe807;p=linux-2.6-omap-h63xx.git

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
---

10b275ddfd05ccb414cfe0cc56a0f47ff20fe807
diff --cc fs/proc/array.c
index 9cbab7e9355,4cb81776a7f..965625a0977
--- a/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));
  }
  
 +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)
+ 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);