Merge remote-tracking branch 'lsk/v3.10/topic/devm' into linux-linaro-lsk

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

diff --git a/net/netfilter/nf_nat_amanda.c b/net/netfilter/nf_nat_amanda.c
index 3b67c9d112730af30ed541f56b39aa41f1ffa058..eb772380a202f0037745a4357cf2c00658181bcd 100644 (file)
--- a/net/netfilter/nf_nat_amanda.c
+++ b/net/netfilter/nf_nat_amanda.c
@@ -1,6 +1,7 @@
 /* Amanda extension for TCP NAT alteration.
  * (C) 2002 by Brian J. Murrell <netfilter@interlinx.bc.ca>
  * based on a copy of HW's ip_nat_irc.c as well as other modules
+ * (C) 2006-2012 Patrick McHardy <kaber@trash.net>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License