diff options
| author | Vince Kim <vince.kim@ti.com> | 2012-01-13 15:09:57 -0800 |
|---|---|---|
| committer | Dan Murphy <dmurphy@ti.com> | 2012-02-14 12:52:17 -0600 |
| commit | 0a39f6bc1918e871256fa3b4a0138d25c0708a95 (patch) | |
| tree | ffb773a15a32ee820c099b9124d5f0da11672959 /net/netfilter | |
| parent | 14a487e4c4a5f67c934f27bbeffc95c946eab107 (diff) | |
| download | kernel_samsung_espresso10-0a39f6bc1918e871256fa3b4a0138d25c0708a95.zip kernel_samsung_espresso10-0a39f6bc1918e871256fa3b4a0138d25c0708a95.tar.gz kernel_samsung_espresso10-0a39f6bc1918e871256fa3b4a0138d25c0708a95.tar.bz2 | |
netfilter: remove leftover git merge error
Change-Id: I5ca8a50ec7ce9d6f037863e02fbf82601bdedfeb
Signed-off-by: Vince Kim <vince.kim@ti.com>
Diffstat (limited to 'net/netfilter')
| -rw-r--r-- | net/netfilter/xt_qtaguid.c | 2 |
1 files changed, 0 insertions, 2 deletions
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; |