Merge tag 'clksrc-cleanup-for-3.10' of git://sources.calxeda.com/kernel/linux into...
authorArnd Bergmann <arnd@arndb.de>
Fri, 15 Mar 2013 21:57:45 +0000 (22:57 +0100)
committerArnd Bergmann <arnd@arndb.de>
Fri, 15 Mar 2013 21:57:45 +0000 (22:57 +0100)
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: Arnd Bergmann <arnd@arndb.de>

Trivial merge