diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-08-23 10:43:14 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-08-23 10:43:14 +0100 |
| commit | ac0c955d5048c2c580fa7166a89133f0fd76c125 (patch) | |
| tree | 041ac4fb544c7244a1a0b35c8ceabc142d5645c1 /net/xfrm | |
| parent | 68d09b1b6780415d82160f6b6d88e82bd724e691 (diff) | |
| parent | b377fd3982ad957c796758a90e2988401a884241 (diff) | |
| download | linux-ac0c955d5048c2c580fa7166a89133f0fd76c125.tar.bz2 | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'net/xfrm')
| -rw-r--r-- | net/xfrm/xfrm_policy.c | 3 | ||||
| -rw-r--r-- | net/xfrm/xfrm_state.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c index e5a3be03aa0d..7012891d39f2 100644 --- a/net/xfrm/xfrm_policy.c +++ b/net/xfrm/xfrm_policy.c @@ -23,10 +23,9 @@ #include <linux/netfilter.h> #include <linux/module.h> #include <linux/cache.h> +#include <linux/audit.h> #include <net/xfrm.h> #include <net/ip.h> -#include <linux/audit.h> -#include <linux/cache.h> #include "xfrm_hash.h" diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c index 31be405efb55..d4356e6f7f9b 100644 --- a/net/xfrm/xfrm_state.c +++ b/net/xfrm/xfrm_state.c @@ -19,9 +19,8 @@ #include <linux/ipsec.h> #include <linux/module.h> #include <linux/cache.h> -#include <asm/uaccess.h> #include <linux/audit.h> -#include <linux/cache.h> +#include <asm/uaccess.h> #include "xfrm_hash.h" |