diff --git a/[refs] b/[refs] index 4ca8b89fb392..e0d0186b9d72 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0ef0f46580320a7f96c60b20b7a29b0bd820d2e7 +refs/heads/master: 4ad9d4fa94800573edaca18ba2f34f27137c9bc0 diff --git a/trunk/net/netfilter/nfnetlink_queue.c b/trunk/net/netfilter/nfnetlink_queue.c index 6148a41aa978..d94de48f6cdb 100644 --- a/trunk/net/netfilter/nfnetlink_queue.c +++ b/trunk/net/netfilter/nfnetlink_queue.c @@ -3,6 +3,7 @@ * userspace via nfetlink. * * (C) 2005 by Harald Welte + * (C) 2007 by Patrick McHardy * * Based on the old ipv4-only ip_queue.c: * (C) 2000-2002 James Morris