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
..
configs	parisc: update defconfigs	2009-03-13 01:33:34 -04:00
hpux	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 commit 'v2.6.35-rc3' into perf/core	2010-06-18 10:53:19 +02:00
kernel	Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2010-08-06 09:39:22 -07:00
lib	parisc: add strict copy size checks (v2)	2010-03-06 22:54:09 +00:00
math-emu	parisc: clear floating point exception flag on SIGFPE signal	2010-05-30 05:39:58 -04:00
mm	parisc: invoke oom-killer from page fault	2010-05-30 05:41:30 -04:00
oprofile	oprofile: more whitespace fixes	2008-10-15 20:55:51 +02:00
defpalo.conf	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
install.sh	kbuild: use INSTALLKERNEL to select customized installkernel script	2009-09-20 12:18:14 +02:00
Kconfig	time: Kill off CONFIG_GENERIC_TIME	2010-07-27 12:40:54 +02:00
Kconfig.debug	parisc: add strict copy size checks (v2)	2010-03-06 22:54:09 +00:00
Makefile	kbuild: use INSTALLKERNEL to select customized installkernel script	2009-09-20 12:18:14 +02:00
nm	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00