From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 1 Jun 2015 15:41:46 +0000 (+0200)
Subject: Merge tag 'arm-soc/for-4.2/dts-fixes' of http://github.com/broadcom/stblinux into... 
X-Git-Tag: firefly_0821_release~176^2~1556^2~19
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=63cb275e6e7a023f4e25d227a875f06563c9d7e9;p=firefly-linux-kernel-4.4.55.git

Merge tag 'arm-soc/for-4.2/dts-fixes' of github.com/broadcom/stblinux into next/dt

Merge "This pull request contains a single change" from Florian Fainelli:

- fix the NAND controller node on bcm63138, the original change was a mis-merge that
  did not properly parent it to the "ubus" node

* tag 'arm-soc/for-4.2/dts-fixes' of http://github.com/broadcom/stblinux:
  ARM: dts: BCM63xx: re-parent NAND controller node
---

63cb275e6e7a023f4e25d227a875f06563c9d7e9