Linus Torvalds b62ad9ab18 Merge branch 'timers-timekeeping-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip ... * 'timers-timekeeping-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: um: Fix read_persistent_clock fallout kgdb: Do not access xtime directly powerpc: Clean up obsolete code relating to decrementer and timebase powerpc: Rework VDSO gettimeofday to prevent time going backwards clocksource: Add __clocksource_updatefreq_hz/khz methods x86: Convert common clocksources to use clocksource_register_hz/khz timekeeping: Make xtime and wall_to_monotonic static hrtimer: Cleanup direct access to wall_to_monotonic um: Convert to use read_persistent_clock timkeeping: Fix update_vsyscall to provide wall_to_monotonic offset powerpc: Cleanup xtime usage powerpc: Simplify update_vsyscall time: Kill off CONFIG_GENERIC_TIME time: Implement timespec_add x86: Fix vtime/file timestamp inconsistencies Trivial conflicts in Documentation/feature-removal-schedule.txt Much less trivial conflicts in arch/powerpc/kernel/time.c resolved as per Thomas' earlier merge commit 47916be4e2 ("Merge branch 'powerpc.cherry-picks' into timers/clocksource")		2010-08-06 13:18:29 -07:00
..
clockevents.c	clockevent: Don't remove broadcast device when cpu is dead	2010-01-18 14:44:50 +01:00
clocksource.c	clocksource: Add __clocksource_updatefreq_hz/khz methods	2010-07-27 12:40:55 +02:00
jiffies.c	clocksource: Cleanup clocksource selection	2009-08-15 10:55:46 +02:00
Kconfig	time: Kill off CONFIG_GENERIC_TIME	2010-07-27 12:40:54 +02:00
Makefile	time: add function to convert between calendar time and broken-down time for universal use	2009-09-24 07:20:56 -07:00
ntp.c	ntp: Make time_adjust static	2010-03-23 17:19:37 +01:00
tick-broadcast.c	fix comment/printk typos concerning "already"	2010-07-11 21:45:40 +02:00
tick-common.c	clockevents: Convert to raw_spinlock	2009-12-14 23:55:34 +01:00
tick-internal.h	clockevents: Make tick_device_lock static	2009-12-14 23:55:34 +01:00
tick-oneshot.c	clockevents: Sanitize min_delta_ns adjustment and prevent overflows	2010-03-12 19:10:29 +01:00
tick-sched.c	Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2010-08-06 13:12:36 -07:00
timecompare.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09: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: Make xtime and wall_to_monotonic static	2010-07-27 12:40:55 +02:00
timer_list.c	sched: Intoduce get_cpu_iowait_time_us()	2010-05-09 19:35:27 +02:00
timer_stats.c	hrtimers: Convert to raw_spinlocks	2009-12-14 23:55:34 +01:00