]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commit
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)
commitb0d62d977674d178ac9bc0acaa3cb5cdd166035d
tree6e8f7b99b9ecdb8869acc12a5e5af29d08f57e31
parenta3fe14c69049750b7540c66e2a4abceb03815f65
parentda4a686a2cfb077a8bfc1697f597e7f86235b822
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: Arnd Bergmann <arnd@arndb.de>