Merge tag 'samsung-dt-exynos-srom-fixup-4.7' of git://git.kernel.org/pub/scm/linux...
authorArnd Bergmann <arnd@arndb.de>
Thu, 28 Apr 2016 15:40:37 +0000 (17:40 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 28 Apr 2016 15:40:37 +0000 (17:40 +0200)
commit2c695998678d26b701fae9eafeac464822227103
tree9384521c82992fde171876fabb43d5d1e1f3cea5
parent816a1b15efa9ec4d36c570f635ee6a3e5b1ac06d
parent4d7820b0465a78e6c85a74474b89fb4ab84768ba
Merge tag 'samsung-dt-exynos-srom-fixup-4.7' of git://git./linux/kernel/git/krzk/linux into next/dt

Merge "ARM: dts: exynos: Fixup for SROM controller (v4.7)" from Krzysztof Kozlowski:

DeviceTree changes for new SROM controller driver reached mainline
some time ago, before the driver was accepted (due to very late
comments). However, after these late comments, the driver expects
different bindings so we need to fix the DTS.

* tag 'samsung-dt-exynos-srom-fixup-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: dts: change SROM node compatible from generic to model specific
arch/arm/boot/dts/exynos4.dtsi