Thomas Gleixner e8b9dd7e24 Merge branch 'timers/urgent' into timers/core ... Reason: Update to upstream changes to avoid further conflicts. Fixup a trivial merge conflict in kernel/time/tick-sched.c Signed-off-by: Thomas Gleixner <tglx@linutronix.de>		2012-07-15 10:24:53 +02:00
..
Kconfig	timers: Fixup the Kconfig consolidation fallout	2012-05-21 23:43:46 +02:00
Makefile	timers: Introduce in-kernel alarm-timer interface	2011-04-26 14:01:44 -07:00
alarmtimer.c	alarmtimer: Provide accessor to alarmtimer rtc device	2012-04-20 14:56:36 -07:00
clockevents.c	clockevents: Make clockevents_config() a global symbol	2012-05-25 01:44:51 +02:00
clocksource.c	kernel-time: fix s/then/than/ spelling errors	2012-03-23 16:49:21 -07:00
jiffies.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
ntp.c	ntp: Fix STA_INS/DEL clearing bug	2012-07-15 09:48:49 +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	clockevents: Make minimum delay adjustments configurable	2011-09-08 11:10:56 +02:00
tick-internal.h	clockevents: Make minimum delay adjustments configurable	2011-09-08 11:10:56 +02:00
tick-oneshot.c	clockevents: Make minimum delay adjustments configurable	2011-09-08 11:10:56 +02:00
tick-sched.c	Merge branch 'timers/urgent' into timers/core	2012-07-15 10:24:53 +02: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	timekeeping: Provide hrtimer update function	2012-07-11 23:34:39 +02: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