Merge branch 'master' into next

This commit is contained in:
James Morris
2010-05-06 10:56:07 +10:00
5014 changed files with 37859 additions and 10471 deletions

View File

@@ -18,6 +18,7 @@
#include <linux/crypto.h>
#include <linux/scatterlist.h>
#include <linux/err.h>
#include <linux/slab.h>
#include "ima.h"
static int init_desc(struct hash_desc *desc)