diff options
| author | Linus Torvalds <[email protected]> | 2017-06-26 12:25:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2017-06-26 12:25:59 -0700 |
| commit | da8b14e45c8b8234cb9a609c947f7e4d15f8dbef (patch) | |
| tree | 94c6bbe28a4e5fdecc7808136ecbc8b10804f1c5 | |
| parent | 9d646c97e1abf777cf229031365860e7bc1c588c (diff) | |
| parent | 91ebcd1b97aea87172e8ae8871f1f328b9fa9c05 (diff) | |
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-- | MAINTAINERS | 2 |
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 <[email protected]> -M: Aurelien Jacquiot <[email protected]> +M: Aurelien Jacquiot <[email protected]> W: http://www.linux-c6x.org/wiki/index.php/Main_Page S: Maintained |