From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 10 May 2016 11:48:48 +0000 (+0200)
Subject: Merge branch 'renesas/fixes-2' into next/dt64
X-Git-Tag: v4.7-rc1~135^2~6
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=41caed560f800768f0f475ff2bec1e1b92674c0b;p=karo-tx-linux.git

Merge branch 'renesas/fixes-2' into next/dt64

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
---

41caed560f800768f0f475ff2bec1e1b92674c0b