| commit | 1c5ba67d2277ac2faf37c61076e8b5fa312be492 | [log] [tgz] |
|---|---|---|
| author | Pablo Neira Ayuso <pablo@netfilter.org> | Tue Jun 25 01:32:59 2019 +0200 |
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | Tue Jun 25 01:32:59 2019 +0200 |
| tree | a645a1a2f7aea7faafcd67c6ba1bfd424b95cd7d | |
| parent | dbb5281a1f84b2f93032d4864c211ce8a20811a7 [diff] | |
| parent | 045df37e743c7448931131988e99e8fe0cc92a54 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
Resolve conflict between d2912cb15bdd ("treewide: Replace GPLv2
boilerplate/reference with SPDX - rule 500") removing the GPL disclaimer
and fe03d4745675 ("Update my email address") which updates Jozsef
Kadlecsik's email.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>