Skip to content
Commit b0d62d97 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'clksrc-cleanup-for-3.10' of git://sources.calxeda.com/kernel/linux into next/cleanup

From Rob Herring <robherring2@gmail.com>:

- Add device_node ptr to clocksource init functions
- Add CLKSRC_OF support to twd_smp timer

* tag 'clksrc-cleanup-for-3.10' of git://sources.calxeda.com/kernel/linux

:
  ARM: smp_twd: convert to use CLKSRC_OF init
  clocksource: tegra20: use the device_node pointer passed to init
  clocksource: pass DT node pointer to init functions
  clocksource: add empty version of clocksource_of_init

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents a3fe14c6 da4a686a
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment