diff options
author | Arnd Bergmann <arnd@arndb.de> | 2013-04-08 18:34:19 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2013-04-08 18:34:19 +0200 |
commit | 6b5606e0834bb173a8ce3505edec078f135e9f6c (patch) | |
tree | 9f3bdc09be01e14fb68368b1c111a04cc570518f /drivers/clocksource/arm_arch_timer.c | |
parent | Merge tag 'vt8500/pinctrl' of git://server.prisktech.co.nz/git/linuxwmt into ... (diff) | |
parent | arm: zynq: Move timer to generic location (diff) | |
download | linux-6b5606e0834bb173a8ce3505edec078f135e9f6c.tar.xz linux-6b5606e0834bb173a8ce3505edec078f135e9f6c.zip |
Merge branch 'zynq/clksrc/cleanup' of git://git.xilinx.com/linux-xlnx into next/drivers
From Michal Simek <michal.simek@xilinx.com>:
* 'zynq/clksrc/cleanup' of git://git.xilinx.com/linux-xlnx:
arm: zynq: Move timer to generic location
arm: zynq: Do not use xilinx specific function names
arm: zynq: Move timer to clocksource interface
arm: zynq: Use standard timer binding
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/clocksource/arm_arch_timer.c')
0 files changed, 0 insertions, 0 deletions