Merge commit '6bb27d7349db51b50c40534710fe164ca0d58902' into omap-timer-for-v3.10

diff --cc arch/arm/mach-davinci/board-dm646x-evm.c
Simple merge

diff --cc arch/arm/mach-highbank/highbank.c
index e6c0612,f6ca285..ff7a4fa
--- 1/arch/arm/mach-highbank/highbank.c
--- 2/arch/arm/mach-highbank/highbank.c
+++ b/arch/arm/mach-highbank/highbank.c
@@@ -130,13 -129,9 +130,9 @@@ static void __init highbank_timer_init(
        arch_timer_sched_clock_init();
  }
  
- static struct sys_timer highbank_timer = {
-       .init = highbank_timer_init,
- };
- 
  static void highbank_power_off(void)
  {
 -      hignbank_set_pwr_shutdown();
 +      highbank_set_pwr_shutdown();
  
        while (1)
                cpu_do_idle();

diff --cc arch/arm/mach-integrator/integrator_ap.c
Simple merge

diff --cc arch/arm/mach-integrator/integrator_cp.c
Simple merge

diff --cc arch/arm/mach-kirkwood/board-dt.c
Simple merge

diff --cc arch/arm/mach-ks8695/board-acs5k.c
Simple merge

diff --cc arch/arm/mach-nomadik/board-nhk8815.c
Simple merge

diff --cc arch/arm/mach-omap1/board-ams-delta.c
Simple merge

diff --cc arch/arm/mach-omap2/board-omap3beagle.c
Simple merge

diff --cc arch/arm/mach-omap2/board-omap4panda.c
Simple merge

diff --cc arch/arm/mach-omap2/timer.c
Simple merge

diff --cc arch/arm/mach-s3c64xx/mach-crag6410.c
Simple merge

diff --cc arch/arm/mach-ux500/cpu-db8500.c
Simple merge

diff --cc arch/arm/plat-samsung/include/plat/cpu.h
Simple merge