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

Browse source

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

...

This commit is contained in:

Arnd Bergmann 2016-05-10 13:48:48 +02:00

parent d6a58a5cc1 f5515f9cdf

commit 41caed560f

4 changed files with 14 additions and 34 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

arch/arm/boot/dts/r8a7791-koelsch.dts

View file

14

arch/arm/boot/dts/r8a7791-porter.dts

View file

5

arch/arm/boot/dts/r8a7791.dtsi

View file

28

arch/arm/mach-shmobile/timer.c

View file