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
..
boards	Merge git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6	2009-12-15 09:01:00 -08:00
boot	avr32: remove .note.gnu.build-id section when making vmlinux.bin	2008-12-17 11:44:10 +01:00
configs	avr32: update default configurations for ATNGW100, ATSTK1002 and ATSTK1006	2009-12-14 19:33:37 +01:00
include/asm	Merge commit 'v2.6.35' into perf/core	2010-08-02 08:31:54 +02:00
kernel	Merge branch 'timers-for-linus-cleanups' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2010-05-19 17:10:06 -07:00
lib	avr32/lib: fix unaligned memcpy where len < 4	2009-07-27 12:37:28 +02:00
mach-at32ap	serial: fix rs485 for atmel_serial on avr32	2010-07-26 11:59:31 -07:00
mm	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
oprofile	Add kernel support for oprofile callgraphs on AVR32	2008-09-22 09:51:01 +02:00
Kconfig	time: Kill off CONFIG_GENERIC_TIME	2010-07-27 12:40:54 +02:00
Kconfig.debug	[AVR32] Include instrumentation menu	2008-01-25 08:31:40 +01:00
Makefile	kbuild: allow assignment to {A,C,LD}FLAGS_MODULE on the command line	2010-08-03 14:09:45 +02:00