Merge commit 'v2.6.29' into core/header-fixes

This commit is contained in:
Ingo Molnar
2009-03-26 18:29:40 +01:00
1721 changed files with 65626 additions and 44019 deletions

View File

@@ -4,7 +4,7 @@
#include <linux/types.h>
#define XT_NFLOG_DEFAULT_GROUP 0x1
#define XT_NFLOG_DEFAULT_THRESHOLD 1
#define XT_NFLOG_DEFAULT_THRESHOLD 0
#define XT_NFLOG_MASK 0x0