Merge tag 'berlin-dt-for-v4.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorArnd Bergmann <arnd@arndb.de>
Wed, 30 Nov 2016 22:45:22 +0000 (23:45 +0100)
committerArnd Bergmann <arnd@arndb.de>
Wed, 30 Nov 2016 22:45:22 +0000 (23:45 +0100)
commit54137bf6112db699329cbe915ea7332c8cbbeace
treee52cac100c4fc1dd25aabbeed2edf6dd153f5528
parentbb2d850778477a5ac30bf2752658856f20c2b1ac
parent0248994d7cce890e9bb75a8ee2d41016c990a7fd
Merge tag 'berlin-dt-for-v4.10-1' of git://git./linux/kernel/git/jszhang/linux-berlin into next/dt

Pull "Berlin DT changes for v4.10" from Jisheng Zhang:

- fix DTC compiler warning
- fix typo in chosen node

* tag 'berlin-dt-for-v4.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jszhang/linux-berlin:
  ARM: dts: berlin2q-marvell-dmp: fix typo in chosen node
  ARM: dts: berlin2q-marvell-dmp: fix regulators' name