From: Olof Johansson <olof@lixom.net>
Date: Wed, 12 Jun 2013 19:32:01 +0000 (-0700)
Subject: Merge tag 'dw_apb_timer_of' of git://github.com/mmind/linux-rockchip into next/drivers
X-Git-Tag: v3.11-rc1~150^2~16
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7d428ce284fce4aacb215ca15d0274e7261864a3;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge tag 'dw_apb_timer_of' of git://github.com/mmind/linux-rockchip into next/drivers

From Heiko Stuebner, enhancements for dw_apb_timer:
- use DECLARE_CLOCKSOURCE_OF and convert its users
- handle the sptimer not being present as sched_clock
- add optional handling of timer clocks

* tag 'dw_apb_timer_of' of git://github.com/mmind/linux-rockchip:
  clocksource: dw_apb_timer_of: use clocksource_of_init
  clocksource: dw_apb_timer_of: select DW_APB_TIMER
  clocksource: dw_apb_timer_of: add clock-handling
  clocksource: dw_apb_timer_of: enable the use the clocksource as sched clock
---

7d428ce284fce4aacb215ca15d0274e7261864a3