]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'next/dt' into for-next
authorOlof Johansson <olof@lixom.net>
Thu, 22 Oct 2015 17:11:29 +0000 (10:11 -0700)
committerOlof Johansson <olof@lixom.net>
Thu, 22 Oct 2015 17:11:29 +0000 (10:11 -0700)
* next/dt:
  ARM: socfpga: dts: sort nodes alphabetically
  ARM: socfpga: dts: add fpga manager


Trivial merge