Merge branch 'linus' into timers/core

[mv-sheeva.git] / kernel / time.c

diff --git a/kernel/time.c b/kernel/time.c
index 2358a3646a63b7438cea3787528c9f33c2d1aa9b..50612faa9baf268f95df39c5a518c3b9b4fce606 100644 (file)
--- a/kernel/time.c
+++ b/kernel/time.c
@@ -35,7 +35,6 @@
 #include <linux/syscalls.h>
 #include <linux/security.h>
 #include <linux/fs.h>
-#include <linux/slab.h>
 #include <linux/math64.h>
 #include <linux/ptrace.h>