diff options
| author | James Morris <james.l.morris@oracle.com> | 2012-05-21 21:21:06 -0400 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2012-05-21 21:21:06 -0400 |
| commit | ff2bb047c4bce9742e94911eeb44b4d6ff4734ab (patch) | |
| tree | 9d9b1cfa3fc17f0cc13f34ca697306cb1f46b05f /net | |
| parent | cffee16e8b997ab947de661e8820e486b0830c94 (diff) | |
| parent | c737f8284cac91428f8fcc8281e69117fa16e887 (diff) | |
Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into next
Per pull request, for 3.5.
Diffstat (limited to 'net')
| -rw-r--r-- | net/xfrm/xfrm_policy.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c index 7661576b6f45..596f125658f6 100644 --- a/net/xfrm/xfrm_policy.c +++ b/net/xfrm/xfrm_policy.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #include <linux/cache.h> | 26 | #include <linux/cache.h> |
| 27 | #include <linux/audit.h> | 27 | #include <linux/audit.h> |
| 28 | #include <net/dst.h> | 28 | #include <net/dst.h> |
| 29 | #include <net/flow.h> | ||
| 29 | #include <net/xfrm.h> | 30 | #include <net/xfrm.h> |
| 30 | #include <net/ip.h> | 31 | #include <net/ip.h> |
| 31 | #ifdef CONFIG_XFRM_STATISTICS | 32 | #ifdef CONFIG_XFRM_STATISTICS |