projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit '3ff195b011d7decf501a4d55aeed312731094796' into for-linus
[cascardo/linux.git]
/
kernel
/
trace
/
power-traces.c
diff --git
a/kernel/trace/power-traces.c
b/kernel/trace/power-traces.c
index
9f4f565
..
a22582a
100644
(file)
--- a/
kernel/trace/power-traces.c
+++ b/
kernel/trace/power-traces.c
@@
-9,7
+9,6
@@
#include <linux/workqueue.h>
#include <linux/sched.h>
#include <linux/module.h>
-#include <linux/slab.h>
#define CREATE_TRACE_POINTS
#include <trace/events/power.h>