projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[firefly-linux-kernel-4.4.55.git]
/
net
/
ipv4
/
netfilter
/
nf_nat_proto_gre.c
diff --git
a/net/ipv4/netfilter/nf_nat_proto_gre.c
b/net/ipv4/netfilter/nf_nat_proto_gre.c
index ea44f02563b5dc5275bb13484fae50b207079b96..690d890111bbdf0c254360e2dfb14d60067810a1 100644
(file)
--- a/
net/ipv4/netfilter/nf_nat_proto_gre.c
+++ b/
net/ipv4/netfilter/nf_nat_proto_gre.c
@@
-21,6
+21,8
@@
*
* Development of this code funded by Astaro AG (http://www.astaro.com/)
*
+ * (C) 2006-2012 Patrick McHardy <kaber@trash.net>
+ *
*/
#include <linux/module.h>