]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'davinci/soc' into next/soc
authorKevin Hilman <khilman@linaro.org>
Thu, 17 Oct 2013 21:36:34 +0000 (14:36 -0700)
committerKevin Hilman <khilman@linaro.org>
Thu, 17 Oct 2013 21:37:25 +0000 (14:37 -0700)
From Sekhar Nori:
* davinci/soc:
  ARM: davinci: convert to clockevents_config_and_register

Signed-off-by: Kevin Hilman <khilman@linaro.org>
1  2 
arch/arm/mach-davinci/time.c

Simple merge