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/tomoyo/domain.c
+++ b/security/tomoyo/domain.c
@@ -11,6 +11,7 @@

 #include "common.h"
 #include <linux/binfmts.h>
+#include <linux/slab.h>

 /* Variables definitions.*/