Thomas Gleixner 9c3f9e2816 Merge branch 'fortglx/3.8/time' of git://git.linaro.org/people/jstultz/linux into timers/core ...

Fix trivial conflicts in: kernel/time/tick-sched.c

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

2012-11-21 20:31:52 +01:00

..

alarmtimer.c

alarmtimer: Rename alarmtimer_remove to alarmtimer_dequeue

2012-09-24 12:38:03 -04:00

clockevents.c

timekeeping: Add suspend and resume of clock event devices

2012-09-04 01:36:01 +02: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

timers: Introduce in-kernel alarm-timer interface

2011-04-26 14:01:44 -07:00

ntp.c

time/jiffies: Rename ACTHZ to SHIFTED_HZ

2012-07-31 17:09:12 +02:00

posix-clock.c

kernel: Fix files explicitly needing EXPORT_SYMBOL infrastructure

2011-10-31 19:30:05 -04:00

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

clockevents: Make minimum delay adjustments configurable

2011-09-08 11:10:56 +02:00

tick-sched.c

Merge branch 'fortglx/3.8/time' of git://git.linaro.org/people/jstultz/linux into timers/core

2012-11-21 20:31:52 +01:00

timecompare.c

time: Use ARRAY_SIZE macro in timecompare.c

2010-10-21 17:30:06 +02:00

timeconv.c

time: add function to convert between calendar time and broken-down time for universal use

2009-09-24 07:20:56 -07:00

timekeeping.c

time: Kill xtime_lock, replacing it with jiffies_lock

2012-11-13 14:08:23 -05:00

timer_list.c

nohz: Rename ts->idle_tick to ts->last_tick

2012-06-11 20:07:17 +02:00

timer_stats.c

locking, timer_stats: Annotate table_lock as raw

2011-09-13 11:12:00 +02:00