summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-06-08 16:28:49 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2017-06-08 16:28:49 -0700
commitaea4156c308670699d74dedb182ebceffb633185 (patch)
treee5eca025f43e6aab2fff14f7b1e73d4e43667ee9
parentdc0cf5a77db9d200284f54a60994c1f6d2fbfc5f (diff)
parent462c5a826eba39fad819ccef916f9943ff42bf0d (diff)
downloadlinux-aea4156c308670699d74dedb182ebceffb633185.tar.bz2
Merge tag 'modules-for-v4.12-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux
Pull module maintainer address change from Jessica Yu: "A single patch that advertises my email address change" * tag 'modules-for-v4.12-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux: MAINTAINERS: update email address for Jessica Yu
-rw-r--r--MAINTAINERS4
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index fb60bf6dfead..92139b62b3b7 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7707,7 +7707,7 @@ F: drivers/platform/x86/hp_accel.c
LIVE PATCHING
M: Josh Poimboeuf <jpoimboe@redhat.com>
-M: Jessica Yu <jeyu@redhat.com>
+M: Jessica Yu <jeyu@kernel.org>
M: Jiri Kosina <jikos@kernel.org>
M: Miroslav Benes <mbenes@suse.cz>
R: Petr Mladek <pmladek@suse.com>
@@ -8588,7 +8588,7 @@ S: Maintained
F: drivers/media/dvb-frontends/mn88473*
MODULE SUPPORT
-M: Jessica Yu <jeyu@redhat.com>
+M: Jessica Yu <jeyu@kernel.org>
M: Rusty Russell <rusty@rustcorp.com.au>
T: git git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux.git modules-next
S: Maintained