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

@@ -33,7 +33,7 @@
#include <linux/sched.h>
#include <linux/key.h>
#include <linux/xfrm.h>
#include <linux/gfp.h>
#include <linux/slab.h>
#include <net/flow.h>
/* Maximum number of letters for an LSM name string */