projects / platform / kernel / linux-rpi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 816a1b1 4d7820b)
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)
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

1  2 
arch/arm/boot/dts/exynos4.dtsi patch | diff1 | diff2 | blob | history

diff --cc arch/arm/boot/dts/exynos4.dtsi
Simple merge
Domain: System / Kernel;