From 52f3550bfbfb933129ec064457126de1a733f355 Mon Sep 17 00:00:00 2001
From: Jesper Juhl <jesper.juhl@gmail.com>
Date: Fri, 10 Aug 2007 15:20:21 -0700
Subject: [PATCH] --- yaml --- r: 63999 b: refs/heads/master c:
 b5890d8ba47741425fe3c0d753e1b57bc0561b7b h: refs/heads/master i:   63997:
 4a9ef2e9075eed20cbb303c99375d0c46a92296f   63995:
 0030de1cc5b413733a522b94dc94b6aca1d1e9ec   63991:
 dead6a095bd4833bfae2ed5375dcd70e7ebd4e30   63983:
 236f03826733ef92785acd0a9dd812cbe7b8a181   63967:
 c0744e4e0bb4ea9931df84529e4ee97b4aef5c00   63935:
 ba2833d56763a5de6a0e10ea21fcf88f9bd5cb12   63871:
 831dcce061f8b6f231dba3e6dd5b74ac8796b9a1   63743:
 5726296a3307f105c2a5d786c3d95b7c401681d2   63487:
 8031156924b9ef682436918f5ea3f5b322cdd5a0 v: v3

---
 [refs]                       | 2 +-
 trunk/net/xfrm/xfrm_policy.c | 3 +--
 trunk/net/xfrm/xfrm_state.c  | 3 +--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 6f48e01a5802..a0a3c17eecd8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 897c77cab0c386103e1c51fe8f3fc7eb5d1eb37f
+refs/heads/master: b5890d8ba47741425fe3c0d753e1b57bc0561b7b
diff --git a/trunk/net/xfrm/xfrm_policy.c b/trunk/net/xfrm/xfrm_policy.c
index e5a3be03aa0d..7012891d39f2 100644
--- a/trunk/net/xfrm/xfrm_policy.c
+++ b/trunk/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/trunk/net/xfrm/xfrm_state.c b/trunk/net/xfrm/xfrm_state.c
index 31be405efb55..d4356e6f7f9b 100644
--- a/trunk/net/xfrm/xfrm_state.c
+++ b/trunk/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"