Merge tag 'mips_4.16_2' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips
commit61f14c015f5be9151ba25e638d349f4d40cb7cd4
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 13 Feb 2018 17:35:17 +0000 (13 09:35 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 13 Feb 2018 17:35:17 +0000 (13 09:35 -0800)
treedd813d35d1f7426e1e568e66151b197a9c576a00
parent178e834c47b0d01352c48730235aae69898fbc02
parent791412dafbbfd860e78983d45cf71db603a82f67
Merge tag 'mips_4.16_2' of git://git./linux/kernel/git/jhogan/mips

Pull MIPS fix from James Hogan:
 "A single change (and associated DT binding update) to allow the
  address of the MIPS Cluster Power Controller (CPC) to be chosen by DT,
  which allows SMP to work on generic MIPS kernels where the bootloader
  hasn't configured the CPC address (i.e. the new Ranchu platform)"

* tag 'mips_4.16_2' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips:
  MIPS: CPC: Map registers using DT in mips_cpc_default_phys_base()
  dt-bindings: Document mti,mips-cpc binding
MAINTAINERS