]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d6f5c7d fe4393e)
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)
commita22b9c9376bf78e0836141693733488585ff2270
tree74cebcd016e79b5ca4fab168655b3136533a3659tree | snapshot
parentd6f5c7d3c01ec929548f1c6bcf62140e4352b8dccommit | diff
parentfe4393ebc8724af4ec10cfa8d8b71be7cf024ce6commit | 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
Linux Kernel Source Tree.