diff options
author | Arnd Bergmann <arnd@arndb.de> | 2016-04-25 20:47:43 (GMT) |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2016-04-25 20:47:43 (GMT) |
commit | 318085c748d46888415ceb20f9c64d9e1b58c3c7 (patch) | |
tree | 09fb4e1e9716b814df8a4815982ad0532a650de0 /fs/no-block.c | |
parent | e24f89e37bee8a11050ce87293814e2c86e3b330 (diff) | |
parent | afa05e55a047f8aa7c865dde5353d96d136aeab2 (diff) | |
download | linux-318085c748d46888415ceb20f9c64d9e1b58c3c7.tar.xz |
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
Diffstat (limited to 'fs/no-block.c')
0 files changed, 0 insertions, 0 deletions