projects / cascardo / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d6a58a5 f5515f9)
Merge branch 'renesas/fixes-2' into next/dt64
authorArnd Bergmann <arnd@arndb.de>
Tue, 10 May 2016 11:48:48 +0000 (13:48 +0200)
committerArnd Bergmann <arnd@arndb.de>
Tue, 10 May 2016 11:48:48 +0000 (13:48 +0200)
This merges fixes from linux-4.6 into the next/dt64 tree to avoid
a later merge conflict.

* renesas/fixes-2:
  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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.