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/integrity/ima/ima_queue.c
+++ b/security/integrity/ima/ima_queue.c
@@ -20,6 +20,7 @@
 */
 #include <linux/module.h>
 #include <linux/rculist.h>
+#include <linux/slab.h>
 #include "ima.h"

 LIST_HEAD(ima_measurements);	/* list of all measurements */