Merge branch 'zynq/clksrc/cleanup' of git://git.xilinx.com/linux-xlnx into next/drivers
authorArnd Bergmann <arnd@arndb.de>
Mon, 8 Apr 2013 16:34:19 +0000 (18:34 +0200)
committerArnd Bergmann <arnd@arndb.de>
Mon, 8 Apr 2013 16:34:19 +0000 (18:34 +0200)
commit6b5606e0834bb173a8ce3505edec078f135e9f6c
tree9f3bdc09be01e14fb68368b1c111a04cc570518f
parente9069cf8b74b50d804fd540a9fd1383504f4af93
parent4f0f234fce1d263cc9881456352e8fd56ead0514
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>
arch/arm/Kconfig