From: Arnd Bergmann Date: Mon, 8 Apr 2013 16:34:19 +0000 (+0200) Subject: Merge branch 'zynq/clksrc/cleanup' of git://git.xilinx.com/linux-xlnx into next/drivers X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6b5606e0834bb173a8ce3505edec078f135e9f6c;p=linux-beck.git Merge branch 'zynq/clksrc/cleanup' of git://git.xilinx.com/linux-xlnx into next/drivers From Michal Simek : * '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 --- 6b5606e0834bb173a8ce3505edec078f135e9f6c