| commit | ae2fe0c0cad76973314955f68a26229b621bc3a2 | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Wed Sep 05 10:39:09 2012 -0700 |
| committer | Olof Johansson <olof@lixom.net> | Wed Sep 05 10:39:09 2012 -0700 |
| tree | 5a27157d34421de93609fe94c9f716561b2ce51e | |
| parent | cd754736097fa6ce03b3543ec111f7a13a0dd2f2 [diff] | |
| parent | c7e783d6adc7798307e7063e11f4127117446d5a [diff] |
Merge tag 'ks8695-time-for-arm-soc' of http://git.kernel.org/pub/scm/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