Merge tag 'renesas-fixes2-for-v4.6' of git://git.kernel.org/pub/scm/linux/kernel...
authorArnd Bergmann <arnd@arndb.de>
Thu, 28 Apr 2016 15:46:27 +0000 (17:46 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 28 Apr 2016 15:46:27 +0000 (17:46 +0200)
commit6383190203b93ff5915edb378acc76bb6a21a604
tree2fad592b3cc28b596c3f70f8268f6ff66098c3d2
parent94379acca0394e8b030d805e7ae20d81b22fa77e
parentf5515f9cdff136dc32517d4b81fe2b9091237b4a
Merge tag 'renesas-fixes2-for-v4.6' of git://git./linux/kernel/git/horms/renesas into fixes

Merge "Second Round of Renesas ARM Based SoC Fixes for v4.6" from Simon Horman:

* Don't disable referenced optional scif clock

* tag 'renesas-fixes2-for-v4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  arm64: dts: r8a7795: Don't disable referenced optional scif clock
  ARM: shmobile: timer: Fix preset_lpj leading to too short delays
  Revert "ARM: dts: porter: Enable SCIF_CLK frequency and pins"
  ARM: dts: r8a7791: Don't disable referenced optional clocks