Olof Johansson
8d84981e39
Merge branch 'clocksource/cleanup' into next/cleanup
...
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: Olof Johansson <olof@lixom.net>
Conflicts:
arch/arm/mach-pxa/time.c
2013-01-14 10:20:02 -08:00
..
alarmtimer.c
alarmtimer: Rename alarmtimer_remove to alarmtimer_dequeue
2012-09-24 12:38:03 -04:00
clockevents.c
clockevents: export clockevents_config_and_register for module use
2013-01-14 10:12:37 -08:00
clocksource.c
kernel-time: fix s/then/than/ spelling errors
2012-03-23 16:49:21 -07:00
jiffies.c
time: Kill xtime_lock, replacing it with jiffies_lock
2012-11-13 14:08:23 -05:00
Kconfig
time: Introduce new GENERIC_TIME_VSYSCALL
2012-09-24 12:38:08 -04:00
Makefile
time: remove the timecompare code.
2012-11-01 11:41:35 -04:00
ntp.c
time/jiffies: Rename ACTHZ to SHIFTED_HZ
2012-07-31 17:09:12 +02:00
posix-clock.c
tick-broadcast.c
tick: Fix the spurious broadcast timer ticks after resume
2012-04-19 21:27:50 +02:00
tick-common.c
time: Kill xtime_lock, replacing it with jiffies_lock
2012-11-13 14:08:23 -05:00
tick-internal.h
time: Kill xtime_lock, replacing it with jiffies_lock
2012-11-13 14:08:23 -05:00
tick-oneshot.c
tick-sched.c
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-12-11 18:22:46 -08:00
timeconv.c
timekeeping.c
time: convert arch_gettimeoffset to a pointer
2012-12-24 09:36:07 -07:00
timer_list.c
nohz: Rename ts->idle_tick to ts->last_tick
2012-06-11 20:07:17 +02:00
timer_stats.c