Merge branch 'renesas/timer' into next/timer

Conflicts:
	arch/arm/mach-shmobile/timer.c

This resolves a nonobvious merge conflict between renesas
timer changes in the global timer changes with those
from the renesas soc branch and last minute bug fixes that
went into v3.3.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --cc arch/arm/kernel/smp_twd.c
Simple merge

diff --cc arch/arm/mach-shmobile/include/mach/common.h
index 9fde3eb686a677a3064ecadbce47e79f6a963272,e41b61a48439b24f736ede6abbe368ab19b3ae20..83ad3fe0a75fc120676b19ebca1d896611076d5a
--- 1/arch/arm/mach-shmobile/include/mach/common.h
--- 2/arch/arm/mach-shmobile/include/mach/common.h
+++ b/arch/arm/mach-shmobile/include/mach/common.h
@@@ -1,9 -1,8 +1,10 @@@
  #ifndef __ARCH_MACH_COMMON_H
  #define __ARCH_MACH_COMMON_H
  
+ extern void shmobile_earlytimer_init(void);
  extern struct sys_timer shmobile_timer;
 +struct twd_local_timer;
 +void shmobile_twd_init(struct twd_local_timer *twd_local_timer);
  extern void shmobile_setup_console(void);
  extern void shmobile_secondary_vector(void);
  extern int shmobile_platform_cpu_kill(unsigned int cpu);

diff --cc arch/arm/mach-shmobile/smp-sh73a0.c
Simple merge

diff --cc arch/arm/mach-shmobile/timer.c
index be16231e86fc611e0c21d59bc311d25a34864a19,be1ad70fe404da94a3614270f912c205b3767948..2fba5f3d1c8ad705309a2e1f3287af5fbb1aee06
--- 1/arch/arm/mach-shmobile/timer.c
--- 2/arch/arm/mach-shmobile/timer.c
+++ b/arch/arm/mach-shmobile/timer.c
@@@ -42,15 -41,10 +42,19 @@@ void __init shmobile_earlytimer_init(vo
        late_time_init = shmobile_late_time_init;
  }
  
+ static void __init shmobile_timer_init(void)
+ {
+ }
+ 
 +void __init shmobile_twd_init(struct twd_local_timer *twd_local_timer)
 +{
 +#ifdef CONFIG_HAVE_ARM_TWD
 +      int err = twd_local_timer_register(twd_local_timer);
 +      if (err)
 +              pr_err("twd_local_timer_register failed %d\n", err);
 +#endif
 +}
 +
  struct sys_timer shmobile_timer = {
        .init           = shmobile_timer_init,
  };