Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 26 Jun 2017 19:25:59 +0000 (12:25 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 26 Jun 2017 19:25:59 +0000 (12:25 -0700)
commitda8b14e45c8b8234cb9a609c947f7e4d15f8dbef
tree94c6bbe28a4e5fdecc7808136ecbc8b10804f1c5
parent9d646c97e1abf777cf229031365860e7bc1c588c
parent91ebcd1b97aea87172e8ae8871f1f328b9fa9c05
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
MAINTAINERS