| commit | 63cb275e6e7a023f4e25d227a875f06563c9d7e9 | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Mon Jun 01 17:41:46 2015 +0200 |
| committer | Arnd Bergmann <arnd@arndb.de> | Mon Jun 01 17:41:46 2015 +0200 |
| tree | 74cebcd016e79b5ca4fab168655b3136533a3659 | |
| parent | e59bff9af4f8e6093909df605f31400eb8bf6c20 [diff] | |
| parent | 9d7ef1b76c131f9b5e0a31fd1444d4fa6b8a841c [diff] |
Merge tag 'arm-soc/for-4.2/dts-fixes' of http://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