diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-08-12 07:41:14 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-08-12 07:41:14 +0200 |
commit | b2a878de11251b06be144b5905e37dd0dc0b0104 (patch) | |
tree | f510ac1263ebd939493c3358408325804f7ba6e2 /include/linux/netfilter/nf_conntrack_h323_asn1.h | |
parent | staging: rtl8712: r8712_xmit_classifier(): Change return values and type (diff) | |
parent | Linux 5.3-rc4 (diff) | |
download | linux-dev-b2a878de11251b06be144b5905e37dd0dc0b0104.tar.xz linux-dev-b2a878de11251b06be144b5905e37dd0dc0b0104.zip |
Merge 5.3-rc4 into staging-next
We need the iio/staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/netfilter/nf_conntrack_h323_asn1.h')
-rw-r--r-- | include/linux/netfilter/nf_conntrack_h323_asn1.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/netfilter/nf_conntrack_h323_asn1.h b/include/linux/netfilter/nf_conntrack_h323_asn1.h index 91d6275292a5..19df78341fb3 100644 --- a/include/linux/netfilter/nf_conntrack_h323_asn1.h +++ b/include/linux/netfilter/nf_conntrack_h323_asn1.h @@ -1,7 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /**************************************************************************** - * ip_conntrack_h323_asn1.h - BER and PER decoding library for H.323 - * conntrack/NAT module. + * BER and PER decoding library for H.323 conntrack/NAT module. * * Copyright (c) 2006 by Jing Min Zhao <zhaojingmin@users.sourceforge.net> * |