Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[firefly-linux-kernel-4.4.55.git] / net / netfilter / xt_conntrack.c

diff --git a/net/netfilter/xt_conntrack.c b/net/netfilter/xt_conntrack.c
index 61805d7b38aa62e880c1e8f4e32f79d1bf5ffdc2..188404b9b002f1a8ef875ceb3a7aebddb13c6c8e 100644 (file)
--- a/net/netfilter/xt_conntrack.c
+++ b/net/netfilter/xt_conntrack.c
@@ -3,6 +3,7 @@
  *     information. (Superset of Rusty's minimalistic state match.)
  *
  *     (C) 2001  Marc Boucher (marc@mbsi.ca).
+ *     (C) 2006-2012 Patrick McHardy <kaber@trash.net>
  *     Copyright © CC Computer Consultants GmbH, 2007 - 2008
  *
  *     This program is free software; you can redistribute it and/or modify