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
..
vdso32
vdso64
asm-offsets.c
audit.c
audit.h
base.S
bitmap.c
compat_audit.c
compat_exec_domain.c
compat_linux.c
compat_linux.h
compat_ptrace.h
compat_signal.c
compat_wrapper.S
cpcmd.c
crash.c
debug.c
diag.c
dis.c
early.c
ebcdic.c
entry64.S
entry.h
entry.S
ftrace.c
head31.S
head64.S
head.S
init_task.c
ipl.c
irq.c
kprobes.c
machine_kexec.c
Makefile
mcount64.S
mcount.S
mem_detect.c
module.c
nmi.c
process.c
processor.c
ptrace.c
reipl64.S
reipl.S
relocate_kernel64.S
relocate_kernel.S
s390_ext.c
s390_ksyms.c
sclp.S
setup.c
signal.c
smp.c
stacktrace.c
suspend.c
switch_cpu64.S
switch_cpu.S
swsusp_asm64.S
sys_s390.c
syscalls.S
sysinfo.c
time.c
topology.c
traps.c
vdso.c
vmlinux.lds.S
vtime.c