Merge commit 'v2.6.29-rc4' into tracing/core

2009-02-09 10:32:48 +01:00
parent 304cc6ae1b 8e4921515c
commit 4ad476e11f
162 changed files with 3103 additions and 2049 deletions
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -445,6 +445,7 @@ struct pacct_struct {
 * @utime:		time spent in user mode, in &cputime_t units
 * @stime:		time spent in kernel mode, in &cputime_t units
 * @sum_exec_runtime:	total time spent on the CPU, in nanoseconds
+ * @lock:		lock for fields in this struct
 *
 * This structure groups together three kinds of CPU time that are
 * tracked for threads and thread groups.  Most things considering