Merge tag 'dw_apb_timer_of' of git://github.com/mmind/linux-rockchip into next/drivers
authorOlof Johansson <olof@lixom.net>
Wed, 12 Jun 2013 19:32:01 +0000 (12:32 -0700)
committerOlof Johansson <olof@lixom.net>
Wed, 12 Jun 2013 19:32:01 +0000 (12:32 -0700)
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


Trivial merge