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)
commit2c49e0250aaf4fba81b19c7bb9cb9b4e278e9a6d
tree1ff8468330cb4ad7bfdbc19e733e6463cea417b5
parent5d3e1cf2452e847ef3ddf8ff042c7f1ac17ede31
parentfd3edcbe9f7bf24b13cadca7616f8e10bbe7e2b3
Merge tag 'renesas-r8a73a4-dt-timers-for-v3.19' of git://git./linux/kernel/git/horms/renesas into next/dt

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>