Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2010-05-03 11:28:58 +08:00
parent 97e3d94aac be1066bbcd
commit df2071bd08
7643 changed files with 241568 additions and 106985 deletions
--- a/crypto/tcrypt.c
+++ b/crypto/tcrypt.c
@@ -18,8 +18,8 @@
 #include <crypto/hash.h>
 #include <linux/err.h>
 #include <linux/init.h>
+#include <linux/gfp.h>
 #include <linux/module.h>
-#include <linux/slab.h>
 #include <linux/scatterlist.h>
 #include <linux/string.h>
 #include <linux/moduleparam.h>