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)
commit002f421a84c5a9260bf0e312af5d5043b3555511
treec66e37172d815fbd403f9adbe6e872e7b67f0d58
parentcf76c364a1e1e5224af80edf70a1e3023e1fcf8c
parent63e19c8216bb03a1b4d10f6637d1324ae7a2b612
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
MAINTAINERS