diff options
author | Andrew Morton <akpm@linux-foundation.org> | 2022-10-16 16:09:11 -0700 |
---|---|---|
committer | Andrew Morton <akpm@linux-foundation.org> | 2022-10-16 16:09:11 -0700 |
commit | 8048b8358031ae742c1c8f16f196f6d8070bb09f (patch) | |
tree | c639bfaecdad37507973aebd3007c7b009362414 /.mailmap | |
parent | 280330fac48280e16454cfa46c368af4812ad79c (diff) | |
parent | 9abf2313adc1ca1b6180c508c25f22f9395cc780 (diff) | |
download | lwn-8048b8358031ae742c1c8f16f196f6d8070bb09f.tar.gz lwn-8048b8358031ae742c1c8f16f196f6d8070bb09f.zip |
Merge branch 'master' into mm-hotfixes-stable
Diffstat (limited to '.mailmap')
-rw-r--r-- | .mailmap | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -137,6 +137,7 @@ Filipe Lautert <filipe@icewall.org> Finn Thain <fthain@linux-m68k.org> <fthain@telegraphics.com.au> Franck Bui-Huu <vagabon.xyz@gmail.com> Frank Rowand <frowand.list@gmail.com> <frank.rowand@am.sony.com> +Frank Rowand <frowand.list@gmail.com> <frank.rowand@sony.com> Frank Rowand <frowand.list@gmail.com> <frank.rowand@sonymobile.com> Frank Rowand <frowand.list@gmail.com> <frowand@mvista.com> Frank Zago <fzago@systemfabricworks.com> @@ -336,6 +337,7 @@ Oleksij Rempel <linux@rempel-privat.de> <external.Oleksij.Rempel@de.bosch.com> Oleksij Rempel <linux@rempel-privat.de> <fixed-term.Oleksij.Rempel@de.bosch.com> Oleksij Rempel <linux@rempel-privat.de> <o.rempel@pengutronix.de> Oleksij Rempel <linux@rempel-privat.de> <ore@pengutronix.de> +Oliver Upton <oliver.upton@linux.dev> <oupton@google.com> Pali Rohár <pali@kernel.org> <pali.rohar@gmail.com> Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Patrick Mochel <mochel@digitalimplant.org> |