From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 25 Apr 2016 20:47:43 +0000 (+0200)
Subject: Merge tag 'samsung-dt64-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk... 
X-Git-Tag: v4.7-rc1~135^2~16
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=318085c748d46888415ceb20f9c64d9e1b58c3c7;p=users%2Fjedix%2Flinux-maple.git

Merge tag 'samsung-dt64-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/dt64

Merge "Samsung Device Tree ARM64 updates and improvements for v4.7" from Krzysztof Kozlowski:

1. Add PL330 DMA controller and Thermal Management Unit to Exynos 7.

* tag 'samsung-dt64-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  arm64: dts: Add nodes for pdma0 and pdma1 for exynos7
  arm64: dts: exynos: Add TMU node for exynos7
---

318085c748d46888415ceb20f9c64d9e1b58c3c7