aboutsummaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
authorDave Jiang <dave.jiang@intel.com>2026-04-15 08:16:31 -0700
committerDave Jiang <dave.jiang@intel.com>2026-04-15 08:16:31 -0700
commit6c724ce0ec6ed8608917673bbb363b208ce2644c (patch)
tree3ea6074858c797d301d73a33c9aafd6a3331aef5 /.mailmap
parent3939dba00f981c26d1748769f2f28a3cc0afb6a8 (diff)
parentdc989bb79380194917351284167f78c3aa084c94 (diff)
downloadlinux-next-history-6c724ce0ec6ed8608917673bbb363b208ce2644c.tar.gz
Merge branch 'for-7.1/cxl-misc' into cxl-for-next
MAINTAINERS: Update Jonathan Cameron's email address
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap1
1 files changed, 1 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 215fe2329cf43..2ffd23c127b97 100644
--- a/.mailmap
+++ b/.mailmap
@@ -418,6 +418,7 @@ John Stultz <johnstul@us.ibm.com>
<jon.toppins+linux@gmail.com> <jtoppins@cumulusnetworks.com>
<jon.toppins+linux@gmail.com> <jtoppins@redhat.com>
Jonas Gorski <jonas.gorski@gmail.com> <jogo@openwrt.org>
+Jonathan Cameron <jic23@kernel.org> <jonathan.cameron@huawei.com>
Jordan Crouse <jordan@cosmicpenguin.net> <jcrouse@codeaurora.org>
<josh@joshtriplett.org> <josh@freedesktop.org>
<josh@joshtriplett.org> <josh@kernel.org>