From 970c2b3ae763307873a12aa7c8cd076f7e80ddb7 Mon Sep 17 00:00:00 2001
From: Rami Rosen <rosenr@marvell.com>
Date: Thu, 23 Aug 2012 02:55:41 +0000
Subject: [PATCH] --- yaml --- r: 327594 b: refs/heads/master c:
 f63c45e0e63fd1bccb6d021fe4de20f82114a024 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/include/net/netns/packet.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f71d99a8a3ed..3e0a7e2018ac 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 748e2d9396a18c3fd3d07d47c1b41320acf1fbf4
+refs/heads/master: f63c45e0e63fd1bccb6d021fe4de20f82114a024
diff --git a/trunk/include/net/netns/packet.h b/trunk/include/net/netns/packet.h
index 4780b080a436..17ec2b95c062 100644
--- a/trunk/include/net/netns/packet.h
+++ b/trunk/include/net/netns/packet.h
@@ -5,7 +5,7 @@
 #define __NETNS_PACKET_H__
 
 #include <linux/rculist.h>
-#include <linux/spinlock.h>
+#include <linux/mutex.h>
 
 struct netns_packet {
 	struct mutex		sklist_lock;