diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-04-28 17:46:27 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-04-28 17:46:27 +0200 |
| commit | 6383190203b93ff5915edb378acc76bb6a21a604 (patch) | |
| tree | 2fad592b3cc28b596c3f70f8268f6ff66098c3d2 /arch/arm/mach-davinci/common.c | |
| parent | 94379acca0394e8b030d805e7ae20d81b22fa77e (diff) | |
| parent | f5515f9cdff136dc32517d4b81fe2b9091237b4a (diff) | |
Merge tag 'renesas-fixes2-for-v4.6' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'arch/arm/mach-davinci/common.c')
0 files changed, 0 insertions, 0 deletions