diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-06-01 17:41:46 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-06-01 17:41:46 +0200 |
| commit | 63cb275e6e7a023f4e25d227a875f06563c9d7e9 (patch) | |
| tree | 74cebcd016e79b5ca4fab168655b3136533a3659 /scripts/objdiff | |
| parent | Merge tag 'mvebu-dt-4.2-2' of git://git.infradead.org/linux-mvebu into next/dt (diff) | |
| parent | ARM: dts: BCM63xx: re-parent NAND controller node (diff) | |
| download | linux-63cb275e6e7a023f4e25d227a875f06563c9d7e9.tar.gz linux-63cb275e6e7a023f4e25d227a875f06563c9d7e9.zip | |
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
Diffstat (limited to 'scripts/objdiff')
0 files changed, 0 insertions, 0 deletions