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	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
include/asm	Merge branch 'linus' into perf/core	2010-06-28 22:33:24 +02:00
kernel	alpha: Detect Super IO chip, no IDE on Avanti, enable EPP19	2010-06-15 14:19:08 -04:00
lib
math-emu	Revert "endian: #define __BYTE_ORDER"	2010-05-26 08:30:15 -07:00
mm	alpha: invoke oom-killer from page fault	2010-05-26 00:40:28 +02:00
oprofile	oprofile: more whitespace fixes	2008-10-15 20:55:51 +02:00
defconfig
Kconfig	time: Kill off CONFIG_GENERIC_TIME	2010-07-27 12:40:54 +02:00
Kconfig.debug
Makefile	alpha: link failure fix	2008-06-20 16:46:10 -07:00