From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 29 Feb 2016 23:16:51 +0000 (+0100)
Subject: Merge tag 'pxa-dt-4.6' of https://github.com/rjarzmik/linux into next/dt
X-Git-Tag: v4.6-rc1~74^2~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=53b28f1c642b92ad356a0766924ac04e53987b84;p=thirdparty%2Fkernel%2Flinux.git

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
---

53b28f1c642b92ad356a0766924ac04e53987b84