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
..
drivers	arch/um/drivers: remove duplicate structure field initialization	2010-07-21 11:16:09 -07:00
include	um, x86: Cast to (u64 *) inside set_64bit()	2010-08-03 07:00:16 -07:00
kernel	um: Fix read_persistent_clock fallout	2010-08-03 20:36:07 +02:00
os-Linux	um: os-linux/mem.c needs sys/stat.h	2010-06-29 15:29:32 -07:00
scripts
sys-i386	Merge branch 'master' into for-next	2010-04-23 02:08:44 +02:00
sys-ia64
sys-ppc
sys-x86_64	UML: Fix compiler warning due to missing task_struct declaration	2010-04-21 01:43:03 +02:00
.gitignore	um: tell git to ignore generated files	2010-03-06 11:26:28 -08:00
defconfig
Kconfig.char
Kconfig.common	time: Kill off CONFIG_GENERIC_TIME	2010-07-27 12:40:54 +02:00
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