Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg...

[net-next-2.6.git] / mm / slab.c

diff --git a/mm/slab.c b/mm/slab.c
index 29aad44a55c2d7fb40e2a0c888cea61de130c944..736e497733d60c99ed376ae2bc1b378aea34a0f7 100644 (file)
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -102,7 +102,6 @@
 #include       <linux/cpu.h>
 #include       <linux/sysctl.h>
 #include       <linux/module.h>
-#include       <linux/kmemtrace.h>
 #include       <linux/rcupdate.h>
 #include       <linux/string.h>
 #include       <linux/uaccess.h>