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
..
boot	FRV: Drop 'TOPDIR' from Makefiles	2008-01-28 23:14:37 +01:00
include/asm	arch: Implement local64_t	2010-06-09 11:12:36 +02:00
kernel	Merge commit 'v2.6.35-rc3' into perf/core	2010-06-18 10:53:19 +02:00
lib	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-09-22 07:51:45 -07:00
mb93090-mb00	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
mm	frv: invoke oom-killer from page fault	2010-06-04 15:21:44 -07:00
defconfig	[PATCH] FRV: Add defconfig	2005-07-07 18:23:42 -07:00
Kconfig	time: Kill off CONFIG_GENERIC_TIME	2010-07-27 12:40:54 +02:00
Kconfig.debug	[PATCH] frv: drop unsupported debugging features	2006-01-08 20:13:36 -08:00
Makefile	frv: clean up arch/frv/Makefile	2010-08-03 14:09:45 +02:00