aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-06-26 12:25:59 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2017-06-26 12:25:59 -0700
commitda8b14e45c8b8234cb9a609c947f7e4d15f8dbef (patch)
tree94c6bbe28a4e5fdecc7808136ecbc8b10804f1c5
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux (diff)
parentMAINTAINERS: update email address for C6x maintainer (diff)
downloadlinux-dev-da8b14e45c8b8234cb9a609c947f7e4d15f8dbef.tar.xz
linux-dev-da8b14e45c8b8234cb9a609c947f7e4d15f8dbef.zip
Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming
Pull c6x fixlet from Mark Salter: "Update maintainer email" * tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming: MAINTAINERS: update email address for C6x maintainer
-rw-r--r--MAINTAINERS2
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 09b5ab6a8a5c..767e9d202adf 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2964,7 +2964,7 @@ F: sound/pci/oxygen/
C6X ARCHITECTURE
M: Mark Salter <msalter@redhat.com>
-M: Aurelien Jacquiot <a-jacquiot@ti.com>
+M: Aurelien Jacquiot <jacquiot.aurelien@gmail.com>
L: linux-c6x-dev@linux-c6x.org
W: http://www.linux-c6x.org/wiki/index.php/Main_Page
S: Maintained