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
..
boot	microblaze: Do not use _start in vmlinux	2010-08-04 10:22:41 +02:00
configs	microblaze: Defconfig update	2010-05-06 11:37:42 +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 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6	2010-08-05 15:57:35 -07:00
lib	microblaze: Support word copying in copy_tofrom_user	2010-04-01 08:38:25 +02:00
mm	microblaze: Add KGDB support	2010-08-04 10:45:17 +02:00
oprofile	microblaze: Core oprofile configs and hooks	2009-12-14 08:45:07 +01:00
pci	PCI: clear bridge resource range if BIOS assigned bad one	2010-06-11 13:24:51 -07:00
platform	microblaze: Use lowest-common-denominator default CPU settings	2009-12-14 08:45:02 +01:00
Kconfig	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
Kconfig.debug	microblaze: Enable early printk only for uartlite	2010-08-04 10:22:38 +02:00
Makefile	fix typos concerning "hierarchy"	2010-06-16 18:03:14 +02:00