projects / platform / kernel / linux-starfive.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e59bff9 9d7ef1b)
Merge tag 'arm-soc/for-4.2/dts-fixes' of http://github.com/broadcom/stblinux into...
authorArnd Bergmann <arnd@arndb.de>
Mon, 1 Jun 2015 15:41:46 +0000 (17:41 +0200)
committerArnd Bergmann <arnd@arndb.de>
Mon, 1 Jun 2015 15:41:46 +0000 (17:41 +0200)
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


Trivial merge
Domain: System / Kernel;