summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.mailmap1
-rw-r--r--AUTHORS1
2 files changed, 2 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 1ff4ce4..358a3c9 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1 +1,2 @@
Jon Schipp <jonschipp@gmail.com>
+Michael R Torres <mic.ric.tor@gmail.com> <6692889+micrictor@users.noreply.github.com>
diff --git a/AUTHORS b/AUTHORS
index dfe0f17..6ecd130 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -26,6 +26,7 @@ commits in the netsniff-ng repository:
* Markus Amend <markus.amend@telekom.de>
* Martin Hauke <mardnh@gmx.de>
* Matteo Croce <mcroce@redhat.com>
+ * Michael R Torres <mic.ric.tor@gmail.com>
* Michał Purzyński <michalpurzynski1@gmail.com>
* Nick Grauel <nicolas.grauel@plexxi.com>
* Oliver Smith <oliver@zerolag.com>
='right'>12
-rw-r--r--net/netfilter/nf_conntrack_core.c3
-rw-r--r--net/netfilter/nf_conntrack_proto_dccp.c1
-rw-r--r--net/netfilter/nf_conntrack_proto_sctp.c2
-rw-r--r--net/netfilter/nf_conntrack_proto_tcp.c1
-rw-r--r--net/netfilter/nf_conntrack_proto_udp.c3
7 files changed, 15 insertions, 19 deletions
diff --git a/net/ipv4/netfilter/nf_conntrack_proto_icmp.c b/net/ipv4/netfilter/nf_conntrack_proto_icmp.c