From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 13 Feb 2018 17:35:17 +0000 (-0800)
Subject: Merge tag 'mips_4.16_2' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips
X-Git-Tag: for-linus-4.16a-rc2-tag~22
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=61f14c015f5be9151ba25e638d349f4d40cb7cd4;p=users%2Fdwmw2%2Flinux.git

Merge tag 'mips_4.16_2' of git://git.kernel.org/pub/scm/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
---

61f14c015f5be9151ba25e638d349f4d40cb7cd4