• Olof Johansson's avatar
    Merge branch 'clocksource/cleanup' into next/cleanup · 8d84981e
    Olof Johansson authored
    
    
    Clockevent cleanup series from Shawn Guo.
    
    Resolved move/change conflict in mach-pxa/time.c due to the sys_timer
    cleanup.
    
    * clocksource/cleanup:
      clocksource: use clockevents_config_and_register() where possible
      ARM: use clockevents_config_and_register() where possible
      clockevents: export clockevents_config_and_register for module use
      + sync to Linux 3.8-rc3
    Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
    
    Conflicts:
    	arch/arm/mach-pxa/time.c
    8d84981e
board-acs5k.c 5.33 KB