From: Arnd Bergmann Date: Mon, 9 May 2016 14:38:04 +0000 (+0200) Subject: Merge tag 'samsung-fixes-non-critical-4.7' of git://git.kernel.org/pub/scm/linux... X-Git-Tag: v4.7-rc1~139^2^2~2 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ea46a1f8d328331db949586145644c17a4f975d4;p=karo-tx-linux.git Merge tag 'samsung-fixes-non-critical-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/fixes-non-critical Merge "Samsung DTS non-critical fixes for v4.7": 1. Fix s5p-mfc driver probe on Exynos542x Peach boards (need to provide MFC memory banks). On these boards this was broken for long time but apparently no one enabled this driver till now. 2. Fix creation of debugfs entries for one regulator on Exynos4210 Trats board. 3. Fix probing of max8997 MFD driver (and its children) because of missing interrupt. Actually the current version of the driver probes (just without interrupts) but after switching to regmap and regmap-irq, the interrupt will be mandatory. * tag 'samsung-fixes-non-critical-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux: ARM: dts: exynos: Add interrupt line to MAX8997 PMIC on exynos4210-trats ARM: dts: exynos: Fix regulator name to avoid forbidden character on exynos4210-trats ARM: dts: exynos: Add MFC memory banks for Peach boards ARM: EXYNOS: Properly skip unitialized parent clock in power domain on --- ea46a1f8d328331db949586145644c17a4f975d4