git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
drivers
/
base
/
power
/
wakeup.c
diff --git
a/drivers/base/power/wakeup.c
b/drivers/base/power/wakeup.c
index f546f8f107b06a456fc01738d1f8b2c6bcce1b53..1368549704893c0c93e50ccf2ccaaecda51c2b1e 100644
(file)
--- a/
drivers/base/power/wakeup.c
+++ b/
drivers/base/power/wakeup.c
@@
-8,7
+8,7
@@
#include <linux/device.h>
#include <linux/slab.h>
-#include <linux/sched.h>
+#include <linux/sched
/signal
.h>
#include <linux/capability.h>
#include <linux/export.h>
#include <linux/suspend.h>