Merge tag 'plat-versatile-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorOlof Johansson <olof@lixom.net>
Thu, 25 Feb 2016 00:06:09 +0000 (16:06 -0800)
committerOlof Johansson <olof@lixom.net>
Thu, 25 Feb 2016 00:06:09 +0000 (16:06 -0800)
commit797bc813983c4299e6ddf17ec2ddf2e79f9259d7
tree473758cde8cf1ef837c69b851ea1767cc3e91c56
parent1e4ee8791f8554721bf7555b207d8b5207a3b159
parent34d2f4d3a4d6a6b204ebfd12d1d2c159360d41a4
Merge tag 'plat-versatile-cleanup' of git://git./linux/kernel/git/linusw/linux-integrator into next/cleanup

plat-versatile cleanup:
- Removes the clock.c in plat-versatile that is no longer used
- Move ARM to use the generic clockdev.h header

* tag 'plat-versatile-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator:
  ARM: Use generic clkdev.h header
  ARM: plat-versatile: Remove unused clock.c file

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