Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a145164b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents e3d6e0e7 825fcfce

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -4003,7 +4003,7 @@ S: Maintained 
F:	sound/usb/misc/ua101.c



EXTENSIBLE FIRMWARE INTERFACE (EFI)

M:	Matt Fleming <matt.fleming@intel.com>

M:	Matt Fleming <matt@codeblueprint.co.uk>

L:	linux-efi@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi.git

S:	Maintained
@@ -4018,7 +4018,7 @@ F: include/linux/efi*.h 
EFI VARIABLE FILESYSTEM

M:	Matthew Garrett <matthew.garrett@nebula.com>

M:	Jeremy Kerr <jk@ozlabs.org>

M:	Matt Fleming <matt.fleming@intel.com>

M:	Matt Fleming <matt@codeblueprint.co.uk>

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi.git

L:	linux-efi@vger.kernel.org

S:	Maintained