summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2022-04-19 17:02:21 -0400
committerTom Rini <trini@konsulko.com>2022-04-19 17:06:01 -0400
commit246e03476ba325051600017b552460d7f37c3191 (patch)
tree7014c270d3f00cf9f5dc820876726efc1ee78ab0 /.mailmap
parent9acf3726b654d06c50c07c3f45da9eb1cbbadf34 (diff)
parentb8a79164674230f401f696f7eb09315ad02199b5 (diff)
Merge branch '2022-04-19-assorted-updates'
- Migrate CONFIG_SYS_MEM_TOP_HIDE to Kconfig, IOMUX bugfix, 2 BTRFS bugfixes, update .gitignore and .mailmap files, aspeed GPIO bugfix, image-fit and squashfs code cleanups, enable EXT4 and ISO partitions on DeveloperBox. - populate u-boot,bootconf under /chosen, see https://github.com/devicetree-org/dt-schema/pull/71 for corresponding change
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap1
1 files changed, 1 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 1f88ea953ce..3910e056f0d 100644
--- a/.mailmap
+++ b/.mailmap
@@ -43,6 +43,7 @@ Marek Vasut <marex@denx.de> <marex at denx.de>
Markus Klotzbuecher <mk@denx.de>
Masahiro Yamada <yamada.masahiro@socionext.com> <yamada.m@jp.panasonic.com>
Masahiro Yamada <yamada.masahiro@socionext.com> <masahiroy@kernel.org>
+Michal Simek <michal.simek@amd.com> <michal.simek@xilinx.com>
Michal Simek <michal.simek@xilinx.com> <monstr@monstr.eu>
Michal Simek <michal.simek@xilinx.com> <Monstr@seznam.cz>
Michal Simek <michal.simek@xilinx.com> <root@monstr.eu>