Merge branch 'master' into next

2010-05-06 10:56:07 +10:00
parent 4e5d6f7ec3 7ebd467551
commit 0ffbe2699c
5014 changed files with 37859 additions and 10471 deletions
--- a/security/selinux/netlabel.c
+++ b/security/selinux/netlabel.c
@@ -29,6 +29,7 @@

 #include <linux/spinlock.h>
 #include <linux/rcupdate.h>
+#include <linux/gfp.h>
 #include <linux/ip.h>
 #include <linux/ipv6.h>
 #include <net/sock.h>