diff options
author | Jakub Kicinski <kuba@kernel.org> | 2022-06-09 16:38:15 -0700 |
---|---|---|
committer | Jakub Kicinski <kuba@kernel.org> | 2022-06-09 16:38:15 -0700 |
commit | a98a62e456e25048e8d64ec452a1c713169d3517 (patch) | |
tree | 52bc4063aae5015ef28f174d9de409788ee9e0a4 /.mailmap | |
parent | 263efe85a4b618037e1003c9636562d6cbb5f9f3 (diff) | |
parent | 825464e79db4aac936e0fdae62cdfb7546d0028f (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
No conflicts.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to '.mailmap')
-rw-r--r-- | .mailmap | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -201,6 +201,8 @@ Jordan Crouse <jordan@cosmicpenguin.net> <jcrouse@codeaurora.org> <josh@joshtriplett.org> <josht@linux.vnet.ibm.com> <josh@joshtriplett.org> <josht@us.ibm.com> <josh@joshtriplett.org> <josht@vnet.ibm.com> +Josh Poimboeuf <jpoimboe@kernel.org> <jpoimboe@redhat.com> +Josh Poimboeuf <jpoimboe@kernel.org> <jpoimboe@us.ibm.com> Juha Yrjola <at solidboot.com> Juha Yrjola <juha.yrjola@nokia.com> Juha Yrjola <juha.yrjola@solidboot.com> |