Pablo Neira Ayuso 1c5ba67d22 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next ... Resolve conflict between d2912cb15b ("treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500") removing the GPL disclaimer and fe03d47456 ("Update my email address") which updates Jozsef Kadlecsik's email. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>		2019-06-25 01:32:59 +02:00
..
ip_set.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2019-06-25 01:32:59 +02:00
ip_set_bitmap.h
ip_set_comment.h	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
ip_set_counter.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2019-06-25 01:32:59 +02:00
ip_set_getport.h
ip_set_hash.h
ip_set_list.h
ip_set_skbinfo.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2019-06-25 01:32:59 +02:00
ip_set_timeout.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2019-06-25 01:32:59 +02:00
pfxlen.h