Linus Torvalds c7523a7c88 Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip ... Pull timer updates from Thomas Gleixner. Various trivial conflict fixups in arch Kconfig due to addition of unrelated entries nearby. And one slightly more subtle one for sparc32 (new user of GENERIC_CLOCKEVENTS), fixed up as per Thomas. * 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (31 commits) timekeeping: Fix a few minor newline issues. time: remove obsolete declaration ntp: Fix a stale comment and a few stray newlines. ntp: Correct TAI offset during leap second timers: Fixup the Kconfig consolidation fallout x86: Use generic time config unicore32: Use generic time config um: Use generic time config tile: Use generic time config sparc: Use: generic time config sh: Use generic time config score: Use generic time config s390: Use generic time config openrisc: Use generic time config powerpc: Use generic time config mn10300: Use generic time config mips: Use generic time config microblaze: Use generic time config m68k: Use generic time config m32r: Use generic time config ...		2012-05-24 13:29:46 -07: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	Revert "clockevents: Set noop handler in clockevents_exchange_device()"	2011-12-30 13:24:40 -08: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 a stale comment and a few stray newlines.	2012-05-21 16:16:56 -07: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	nohz: Fix stale jiffies update in tick_nohz_restart()	2012-04-06 13:24:17 +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: Fix a few minor newline issues.	2012-05-21 16:20:32 -07:00
timer_list.c	timer debug: Hide kernel addresses via %pK in /proc/timer_list	2011-02-12 14:11:56 +01:00
timer_stats.c	locking, timer_stats: Annotate table_lock as raw	2011-09-13 11:12:00 +02:00