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
/
netfilter
/
nf_conntrack_h323_main.c
diff --git
a/net/netfilter/nf_conntrack_h323_main.c
b/net/netfilter/nf_conntrack_h323_main.c
index 7df7b36d2e2430628dde4bc53c5ca1442f45f92b..bdebd03bc8cd448a75ca94db1c88ea461f72093a 100644
(file)
--- a/
net/netfilter/nf_conntrack_h323_main.c
+++ b/
net/netfilter/nf_conntrack_h323_main.c
@@
-2,6
+2,7
@@
* H.323 connection tracking helper
*
* Copyright (c) 2006 Jing Min Zhao <zhaojingmin@users.sourceforge.net>
+ * Copyright (c) 2006-2012 Patrick McHardy <kaber@trash.net>
*
* This source code is licensed under General Public License version 2.
*