projects / profile / common / platform / kernel / linux-artik7.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit63cb275e6e7a023f4e25d227a875f06563c9d7e9
tree74cebcd016e79b5ca4fab168655b3136533a3659tree | snapshot
parente59bff9af4f8e6093909df605f31400eb8bf6c20commit | diff
parent9d7ef1b76c131f9b5e0a31fd1444d4fa6b8a841ccommit | diff
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
Domain: System / Kernel;