mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/
synced 2026-11-10 20:48:12 +00:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
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>
This commit is contained in:
commit
1c5ba67d22
17765 changed files with 52091 additions and 134452 deletions
Loading…
Add table
Add a link
Reference in a new issue