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

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

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
parents 9d646c97 91ebcd1b

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -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