From: Olof Johansson <olof@lixom.net>
Date: Wed, 5 Sep 2012 17:39:09 +0000 (-0700)
Subject: Merge tag 'ks8695-time-for-arm-soc' of http://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=ae2fe0c0cad76973314955f68a26229b621bc3a2;p=linux-edison.git

Merge tag 'ks8695-time-for-arm-soc' of git./linux/kernel/git/linusw/linux-stericsson into next/cleanup

This cleans up the ks8695 timer driver and converts
it to use generic time and clock events.

* tag 'ks8695-time-for-arm-soc' of http://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
  ARM: ks8695: convert to generic time and clocksource
  ARM: ks8695: delete resume hook from timer
  ARM: ks8695: use [readl|writel]_relaxed()
  ARM: ks8695: merge the timer header into the timer driver
---

ae2fe0c0cad76973314955f68a26229b621bc3a2