From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 6 Jan 2009 09:18:43 +0000 (+0100)
Subject: Merge branches 'tracing/kmemtrace2' and 'tracing/ftrace' into tracing/urgent
X-Git-Tag: v2.6.30-rc1~2^2~193
X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=99793e3dbe39a50d871eedc361659a894601e2bf

Merge branches 'tracing/kmemtrace2' and 'tracing/ftrace' into tracing/urgent
---

99793e3dbe39a50d871eedc361659a894601e2bf
diff --cc kernel/trace/trace.h
index 742fe1349276,a8b624ccd4d6..94ed45e93a80
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@@ -30,11 -28,9 +29,11 @@@ enum trace_type 
  	TRACE_GRAPH_ENT,
  	TRACE_USER_STACK,
  	TRACE_HW_BRANCHES,
 +	TRACE_KMEM_ALLOC,
 +	TRACE_KMEM_FREE,
  	TRACE_POWER,
  
- 	__TRACE_LAST_TYPE
+ 	__TRACE_LAST_TYPE,
  };
  
  /*