From: Olof Johansson Date: Tue, 20 May 2014 06:29:24 +0000 (-0700) Subject: Merge tag 'renesas-clock2-for-v3.16' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Tag: firefly_0821_release~176^2~3781^2~14 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fd46edb9f667e0373eefb0c93745fbde0c9e8161;p=firefly-linux-kernel-4.4.55.git Merge tag 'renesas-clock2-for-v3.16' of git://git./linux/kernel/git/horms/renesas into next/soc Merge "Second Round of Renesas ARM Based SoC Clock Updates for v3.16" from Simon Horman: r8a7791 (R-Car M2) SoC * Correct SYS-DMAC clock defines r8a7740 (R-Mobile A1) SoC * Correct name of DT Ethernet clock * tag 'renesas-clock2-for-v3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: r8a7791: Correct SYS-DMAC clock defines ARM: shmobile: r8a7740: Correct name of DT Ethernet clock Signed-off-by: Olof Johansson --- fd46edb9f667e0373eefb0c93745fbde0c9e8161