summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2019-11-12 13:20:17 +0300
committerThomas Gleixner <tglx@linutronix.de>2019-11-12 13:20:17 +0300
commit2278f452a12d5b5b01f96441a7a4336710365022 (patch)
treea45a45d098ccecd7edfc3303e38ab4699568e8f5 /.mailmap
parenta99d8080aaf358d5d23581244e5da23b35e340b9 (diff)
parentd99c1ba6a73b9e93e2884b7893fe19e3c082ba03 (diff)
downloadlinux-2278f452a12d5b5b01f96441a7a4336710365022.tar.xz
Merge tag 'efi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi into efi/core
Pull EFI changes for v5.5 from Ard Biesheuvel: - Change my email address to @kernel.org so I am no longer at the mercy of useless corporate email infrastructure - Wire up the EFI RNG code for x86. This enables an additional source of entropy during early boot. - Enable the TPM event log code on ARM platforms.
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap1
1 files changed, 1 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 83d7e750c2fc..5d3b741a3f95 100644
--- a/.mailmap
+++ b/.mailmap
@@ -32,6 +32,7 @@ Andy Adamson <andros@citi.umich.edu>
Antoine Tenart <antoine.tenart@free-electrons.com>
Antonio Ospite <ao2@ao2.it> <ao2@amarulasolutions.com>
Archit Taneja <archit@ti.com>
+Ard Biesheuvel <ardb@kernel.org> <ard.biesheuvel@linaro.org>
Arnaud Patard <arnaud.patard@rtp-net.org>
Arnd Bergmann <arnd@arndb.de>
Axel Dyks <xl@xlsigned.net>