Merge tag 'csky-4.20-rc6' of github.com:c-sky/csky-linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 6 Dec 2018 17:23:34 +0000 (09:23 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 6 Dec 2018 17:23:34 +0000 (09:23 -0800)
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

1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge