-
git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next由 Pablo Neira Ayuso 提交于
Resolve conflict between d2912cb1 ("treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500") removing the GPL disclaimer and fe03d474 ("Update my email address") which updates Jozsef Kadlecsik's email. Signed-off-by: NPablo Neira Ayuso <pablo@netfilter.org>
1c5ba67d