![]() * '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
|
||
---|---|---|
.. | ||
drivers | ||
include | ||
kernel | ||
os-Linux | ||
scripts | ||
sys-i386 | ||
sys-ia64 | ||
sys-ppc | ||
sys-x86_64 | ||
.gitignore | ||
defconfig | ||
Kconfig.char | ||
Kconfig.common | ||
Kconfig.debug | ||
Kconfig.net | ||
Kconfig.rest | ||
Kconfig.um | ||
Kconfig.x86 | ||
Makefile | ||
Makefile-i386 | ||
Makefile-ia64 | ||
Makefile-os-Linux | ||
Makefile-ppc | ||
Makefile-skas | ||
Makefile-x86_64 |