Merge branch 'for-3.10' of git://linux-nfs.org/~bfields/linux

[karo-tx-linux.git] / net / netfilter / nf_conntrack_pptp.c

diff --git a/net/netfilter/nf_conntrack_pptp.c b/net/netfilter/nf_conntrack_pptp.c
index e6678d2b624e2c371a7be589117660e68c38adbe..7bd03decd36cef207bc418e80361ed5341b349bc 100644 (file)
--- a/net/netfilter/nf_conntrack_pptp.c
+++ b/net/netfilter/nf_conntrack_pptp.c
@@ -11,6 +11,8 @@
  *
  * Development of this code funded by Astaro AG (http://www.astaro.com/)
  *
+ * (C) 2006-2012 Patrick McHardy <kaber@trash.net>
+ *
  * Limitations:
  *      - We blindly assume that control connections are always
  *        established in PNS->PAC direction.  This is a violation