diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-11-26 14:52:11 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-11-26 14:52:11 -0800 |
| commit | df28204bb0f29cc475c0a8893c99b46a11a4903f (patch) | |
| tree | da198abbba5e9b7a824f531e0ed5c8bba36dbb08 /MAINTAINERS | |
| parent | 3f6128139092286cf10e32bef8ccf56a004812d2 (diff) | |
| parent | 2278f452a12d5b5b01f96441a7a4336710365022 (diff) | |
Merge branch 'efi-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull EFI updates from Ingo Molnar:
"The main changes in this cycle were:
- 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.
- Update Ard's email address"
* 'efi-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
efi: libstub/tpm: enable tpm eventlog function for ARM platforms
x86: efi/random: Invoke EFI_RNG_PROTOCOL to seed the UEFI RNG table
efi/random: use arch-independent efi_call_proto()
MAINTAINERS: update Ard's email address to @kernel.org
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 66cc549ac327..cd7dba87d2ef 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6019,14 +6019,14 @@ F: sound/usb/misc/ua101.c EFI TEST DRIVER L: linux-efi@vger.kernel.org M: Ivan Hu <ivan.hu@canonical.com> -M: Ard Biesheuvel <ard.biesheuvel@linaro.org> +M: Ard Biesheuvel <ardb@kernel.org> S: Maintained F: drivers/firmware/efi/test/ EFI VARIABLE FILESYSTEM M: Matthew Garrett <matthew.garrett@nebula.com> M: Jeremy Kerr <jk@ozlabs.org> -M: Ard Biesheuvel <ard.biesheuvel@linaro.org> +M: Ard Biesheuvel <ardb@kernel.org> T: git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git L: linux-efi@vger.kernel.org S: Maintained @@ -6207,7 +6207,7 @@ S: Supported F: security/integrity/evm/ EXTENSIBLE FIRMWARE INTERFACE (EFI) -M: Ard Biesheuvel <ard.biesheuvel@linaro.org> +M: Ard Biesheuvel <ardb@kernel.org> L: linux-efi@vger.kernel.org T: git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git S: Maintained @@ -15083,7 +15083,7 @@ F: include/media/soc_camera.h F: drivers/staging/media/soc_camera/ SOCIONEXT SYNQUACER I2C DRIVER -M: Ard Biesheuvel <ard.biesheuvel@linaro.org> +M: Ard Biesheuvel <ardb@kernel.org> L: linux-i2c@vger.kernel.org S: Maintained F: drivers/i2c/busses/i2c-synquacer.c |