diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-22 09:32:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-22 09:32:10 -0700 |
| commit | 90e01058bc36b03c638a073cda13bc8e12f3d0f4 (patch) | |
| tree | ef2a62980b31cb0adee13ad4134a9fb1b1aa732f /MAINTAINERS | |
| parent | dcd4693cf47801b7d988ea897519de90dfd25d17 (diff) | |
| parent | b0dddf6c147e6fe61374d625c4bb2b7c52018639 (diff) | |
| download | linux-stable-90e01058bc36b03c638a073cda13bc8e12f3d0f4.tar.gz linux-stable-90e01058bc36b03c638a073cda13bc8e12f3d0f4.tar.bz2 linux-stable-90e01058bc36b03c638a073cda13bc8e12f3d0f4.zip | |
Merge branch 'efi-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull EFI fixes from Ingo Molnar:
"Add Ard Biesheuvel as EFI co-maintainer, plus fix an ARM build bug
with older toolchains"
* 'efi-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
efi/arm: Fix absolute relocation detection for older toolchains
MAINTAINERS: Add myself as EFI maintainer
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index b6c28e1b5876..c44795306342 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4620,8 +4620,9 @@ F: sound/usb/misc/ua101.c EXTENSIBLE FIRMWARE INTERFACE (EFI) M: Matt Fleming <matt@codeblueprint.co.uk> +M: Ard Biesheuvel <ard.biesheuvel@linaro.org> L: linux-efi@vger.kernel.org -T: git git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git S: Maintained F: Documentation/efi-stub.txt F: arch/ia64/kernel/efi.c |