From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 6 Dec 2018 17:23:34 +0000 (-0800)
Subject: Merge tag 'csky-4.20-rc6' of github.com:c-sky/csky-linux
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=002f421a84c5a9260bf0e312af5d5043b3555511;p=linux.git

Merge tag 'csky-4.20-rc6' of github.com:c-sky/csky-linux

Pull C-SKY fixes from Guo Ren:

 - bugfix for tlb_get_pgd() error

 - update MAINTAINERS file for C-SKY drivers

* tag 'csky-4.20-rc6' of github.com:c-sky/csky-linux:
  csky: bugfix tlb_get_pgd error.
  MAINTAINERS: add maintainer for C-SKY drivers
---

002f421a84c5a9260bf0e312af5d5043b3555511