mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2026-05-05 09:57:21 +02:00
1c5ba67d22
Resolve conflict betweend2912cb15b("treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500") removing the GPL disclaimer andfe03d47456("Update my email address") which updates Jozsef Kadlecsik's email. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>