]> git.karo-electronics.de Git - linux-beck.git/commitdiff
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)
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


Trivial merge