forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into next

Browse source
This commit is contained in:
James Morris 2010-05-06 10:56:07 +10:00
commit 0ffbe2699c
5014 changed files with 37859 additions and 10471 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/linux/security.h
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 */