From: Kevin Hilman Date: Fri, 22 Apr 2016 16:58:48 +0000 (-0700) Subject: Merge tag 'renesas-fixes-for-v4.6' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: Ubuntu-5.2.0-15.16~9343^2~6 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=c95e2e7eddfa571dccc8cfe645c790ff7fb7e2e0;p=mirror_ubuntu-eoan-kernel.git Merge tag 'renesas-fixes-for-v4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into fixes Merge "Renesas ARM Based SoC Fixes for v4.6" from Simon Horman: Renesas ARM Based SoC Fixes for v4.6 * Correct preset_lpj calculation which may lead to too short delays * Correct handling of optional clocks on r8a7791 to restore access to the serial port the porter board * tag 'renesas-fixes-for-v4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: 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 --- c95e2e7eddfa571dccc8cfe645c790ff7fb7e2e0