diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-22 12:32:10 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-22 12:32:10 -0400 |
commit | 90e01058bc36b03c638a073cda13bc8e12f3d0f4 (patch) | |
tree | ef2a62980b31cb0adee13ad4134a9fb1b1aa732f /MAINTAINERS | |
parent | dcd4693cf47801b7d988ea897519de90dfd25d17 (diff) | |
parent | b0dddf6c147e6fe61374d625c4bb2b7c52018639 (diff) |
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 | |||
4620 | 4620 | ||
4621 | EXTENSIBLE FIRMWARE INTERFACE (EFI) | 4621 | EXTENSIBLE FIRMWARE INTERFACE (EFI) |
4622 | M: Matt Fleming <matt@codeblueprint.co.uk> | 4622 | M: Matt Fleming <matt@codeblueprint.co.uk> |
4623 | M: Ard Biesheuvel <ard.biesheuvel@linaro.org> | ||
4623 | L: linux-efi@vger.kernel.org | 4624 | L: linux-efi@vger.kernel.org |
4624 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi.git | 4625 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git |
4625 | S: Maintained | 4626 | S: Maintained |
4626 | F: Documentation/efi-stub.txt | 4627 | F: Documentation/efi-stub.txt |
4627 | F: arch/ia64/kernel/efi.c | 4628 | F: arch/ia64/kernel/efi.c |