---

yaml --- r: 291696 b: refs/heads/master c: 42481ba h: refs/heads/master v: v3
git-mirror · Feb 5, 2012 · af444fb · af444fb
1 parent da32c3b
commit af444fb
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 241057486646dd42278538218376c79aae2c359f
+refs/heads/master: 42481ba29033b3e692fe81e6536fc8f59b40ce07
diff --git a/trunk/include/trace/events/power.h b/trunk/include/trace/events/power.h
@@ -65,7 +65,6 @@ TRACE_EVENT(machine_suspend,
 	TP_printk("state=%lu", (unsigned long)__entry->state)
 );
 
-/* This code will be removed after deprecation time exceeded (3.1) */
 #ifdef CONFIG_EVENT_POWER_TRACING_DEPRECATED
 
 /*
-Original file line number
+Diff line change
@@ Expand Up / @@ -65,7 +65,6 @@ TRACE_EVENT(machine_suspend, @@
     	TP_printk("state=%lu", (unsigned long)__entry->state)
     );
-    /* This code will be removed after deprecation time exceeded (3.1) */
     #ifdef CONFIG_EVENT_POWER_TRACING_DEPRECATED
     /*
@@ Expand Down @@