]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit6ed458cdd6d5ca645310cf9cd54e775ec1a19c98
tree9f3bdc09be01e14fb68368b1c111a04cc570518f
parent3ff3760b6ddbb4625f2c77fa59ea950bd3b56be1
parent7eb28d1a8c359b23f7e23b081fb84c90f8d17648
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