diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-11 13:23:00 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-11 13:23:00 -0400 |
commit | a145164ba86543604c54d5c1079a18d5eaabbc1b (patch) | |
tree | 3af5b5a0cc4f9facb417d02446262bf4ac728f0b | |
parent | e3d6e0e70139297977546f7af719396ebc4fe181 (diff) | |
parent | 825fcfce81921c9cc4ef801d844793815721e458 (diff) |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull maintainer email update from Thomas Gleixner:
"Change Matt Fleming's email address in the maintainers file"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
MAINTAINERS: Change Matt Fleming's email address
-rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index b9ce3c6049b1..5f467845ef72 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -4003,7 +4003,7 @@ S: Maintained | |||
4003 | F: sound/usb/misc/ua101.c | 4003 | F: sound/usb/misc/ua101.c |
4004 | 4004 | ||
4005 | EXTENSIBLE FIRMWARE INTERFACE (EFI) | 4005 | EXTENSIBLE FIRMWARE INTERFACE (EFI) |
4006 | M: Matt Fleming <matt.fleming@intel.com> | 4006 | M: Matt Fleming <matt@codeblueprint.co.uk> |
4007 | L: linux-efi@vger.kernel.org | 4007 | L: linux-efi@vger.kernel.org |
4008 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi.git | 4008 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi.git |
4009 | S: Maintained | 4009 | S: Maintained |
@@ -4018,7 +4018,7 @@ F: include/linux/efi*.h | |||
4018 | EFI VARIABLE FILESYSTEM | 4018 | EFI VARIABLE FILESYSTEM |
4019 | M: Matthew Garrett <matthew.garrett@nebula.com> | 4019 | M: Matthew Garrett <matthew.garrett@nebula.com> |
4020 | M: Jeremy Kerr <jk@ozlabs.org> | 4020 | M: Jeremy Kerr <jk@ozlabs.org> |
4021 | M: Matt Fleming <matt.fleming@intel.com> | 4021 | M: Matt Fleming <matt@codeblueprint.co.uk> |
4022 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi.git | 4022 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi.git |
4023 | L: linux-efi@vger.kernel.org | 4023 | L: linux-efi@vger.kernel.org |
4024 | S: Maintained | 4024 | S: Maintained |