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
..
appldata	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2010-08-04 11:47:58 -07:00
boot	[S390] Add support for LZO-compressed kernels.	2010-05-26 23:27:10 +02:00
crypto	crypto: des_s390 - Checkpatch cleanup	2010-05-26 10:41:03 +10:00
hypfs	[S390] s390_hypfs: Add new attributes	2010-05-17 10:00:17 +02:00
include/asm	Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2010-08-06 09:30:52 -07:00
kernel	Merge branch 'timers-timekeeping-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2010-08-06 13:18:29 -07:00
kvm	KVM: Remove memory alias support	2010-08-01 10:47:00 +03:00
lib	[S390] uaccess: make sure copy_from_user_overflow is builtin	2010-03-08 12:25:29 +01:00
math-emu	tree-wide: fix assorted typos all over the place	2009-12-04 15:39:55 +01:00
mm	[S390] appldata/extmem/kvm: add missing GFP_KERNEL flag	2010-06-08 18:58:23 +02:00
oprofile	Combine instrumentation menus in kernel/Kconfig.instrumentation	2007-10-19 11:53:54 -07:00
defconfig	[S390] Update default configuration.	2010-06-08 18:58:23 +02:00
Kconfig	time: Kill off CONFIG_GENERIC_TIME	2010-07-27 12:40:54 +02:00
Kconfig.debug	[S390] uaccess: implement strict user copy checks	2010-02-26 22:37:29 +01:00
Makefile	Merge commit 'v2.6.35' into kbuild/kbuild	2010-08-04 13:59:13 +02:00