From 0a39f6bc1918e871256fa3b4a0138d25c0708a95 Mon Sep 17 00:00:00 2001
From: Vince Kim <vince.kim@ti.com>
Date: Fri, 13 Jan 2012 15:09:57 -0800
Subject: netfilter: remove leftover git merge error

Change-Id: I5ca8a50ec7ce9d6f037863e02fbf82601bdedfeb
Signed-off-by: Vince Kim <vince.kim@ti.com>
---
 net/netfilter/xt_qtaguid.c | 2 --
 1 file changed, 2 deletions(-)

(limited to 'net/netfilter')

diff --git a/net/netfilter/xt_qtaguid.c b/net/netfilter/xt_qtaguid.c
index 53c3c6b..08086d6 100644
--- a/net/netfilter/xt_qtaguid.c
+++ b/net/netfilter/xt_qtaguid.c
@@ -2299,8 +2299,6 @@ static int ctrl_cmd_untag(const char *input)
 	sockfd_put(el_socket);
 
 	kfree(sock_tag_entry);
-<<<<<<< HEAD
-=======
 	atomic64_inc(&qtu_events.sockets_untagged);
 
 	return 0;
-- 
cgit v1.1