Merge tag 'renesas-clock2-for-v3.16' of git://git.kernel.org/pub/scm/linux/kernel...
authorOlof Johansson <olof@lixom.net>
Tue, 20 May 2014 06:29:24 +0000 (23:29 -0700)
committerOlof Johansson <olof@lixom.net>
Tue, 20 May 2014 06:29:24 +0000 (23:29 -0700)
commitfd46edb9f667e0373eefb0c93745fbde0c9e8161
tree13d98edea0dd248e06566e4af5d3d84bb8d17bf2
parent5fe0163aea863b1a5f79173619fdfe9e9baad299
parenta505daa501dc3f02b08d0b48b049bce719299b74
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 <olof@lixom.net>