Merge tag 'pxa-dt-4.6' of https://github.com/rjarzmik/linux into next/dt
authorArnd Bergmann <arnd@arndb.de>
Mon, 29 Feb 2016 23:16:51 +0000 (00:16 +0100)
committerArnd Bergmann <arnd@arndb.de>
Mon, 29 Feb 2016 23:16:51 +0000 (00:16 +0100)
commit53b28f1c642b92ad356a0766924ac04e53987b84
tree5501ba8b9c1c3623ce1be19c885824b92de6555e
parent8898cb4115ad40f74ff769117295fc2c1d166da1
parent07c6b2d01d351f0512ed7145625265e435ab3240
Merge tag 'pxa-dt-4.6' of https://github.com/rjarzmik/linux into next/dt

Merge pxa dt for v4.6 from Robert Jarzmik:

This device-tree pxa update brings :
 - a single fix for nand dmaengine node

* tag 'pxa-dt-4.6' of https://github.com/rjarzmik/linux:
  ARM: dts: pxa: fix dma engine node to pxa3xx-nand