Merge tag 'renesas-r8a73a4-dt-timers-for-v3.19' of git://git.kernel.org/pub/scm/linux...
authorOlof Johansson <olof@lixom.net>
Tue, 4 Nov 2014 22:37:47 +0000 (14:37 -0800)
committerOlof Johansson <olof@lixom.net>
Tue, 4 Nov 2014 22:37:47 +0000 (14:37 -0800)
Merge "Renesas ARM Based SoC r8a73a4 DT Timers Updates for v3.19" from Simon
Horman:

* Initialise CMT1 timer using DT

* tag 'renesas-r8a73a4-dt-timers-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: r8a73a4: Remove empty r8a73a4_add_dt_devices
  ARM: shmobile: ape6evm-reference: Initialise CMT1 device using DT
  ARM: shmobile: r8a73a4: Rename cmt registration helper
  ARM: shmobile: r8a73a4: Add CMT1 node

Signed-off-by: Olof Johansson <olof@lixom.net>

Trivial merge