From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 26 Jun 2017 19:25:59 +0000 (-0700)
Subject: Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming
X-Git-Tag: v4.12~23
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/da8b14e45c8b8234cb9a609c947f7e4d15f8dbef

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
---

da8b14e45c8b8234cb9a609c947f7e4d15f8dbef