Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

2010-04-11 02:44:30 -07:00
parent ae4e8d63b5 0eddb519b9
commit 4a1032faac
4636 changed files with 13310 additions and 6258 deletions
--- a/net/x25/x25_in.c
+++ b/net/x25/x25_in.c
@@ -23,6 +23,7 @@
 *					  i-frames.
 */

+#include <linux/slab.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/string.h>