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
..
amiga	m68k: amiga - RTC platform device conversion	2010-05-26 19:51:10 +02:00
apollo	m68k: apollo core - Kill warn_unused_result warnings	2009-01-12 20:56:35 +01:00
atari	tree-wide: Assorted spelling fixes	2010-02-09 11:13:56 +01:00
bvme6000	m68k: Remove BKL from rtc implementations	2010-05-17 21:15:39 +02:00
configs	mac68k: replace mac68k SCC code with platform device	2010-02-27 18:31:09 +01:00
fpsp040	m68k: fix trigraph ignored warning in setox.S	2008-12-28 20:00:05 +01:00
hp300	m68k: hp300 - Checkpatch cleanup	2010-05-17 21:15:40 +02:00
ifpsp060	tree-wide: fix assorted typos all over the place	2009-12-04 15:39:55 +01:00
include/asm	arch: Implement local64_t	2010-06-09 11:12:36 +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	Stringify support commas	2008-07-20 17:24:38 -07:00
mac	m68k: Remove trailing spaces in messages	2010-05-17 21:15:40 +02:00
math-emu	locking, m68k/asm-offsets: Rename signal defines	2009-09-01 09:38:03 +02:00
mm	m68k: invoke oom-killer from page fault	2010-05-17 21:37:39 +02:00
mvme16x	m68k: Remove BKL from rtc implementations	2010-05-17 21:15:39 +02:00
mvme147	m68k: mvme147 core - Kill warn_unused_result warnings	2009-01-12 20:56:37 +01:00
q40	m68k: Remove trailing spaces in messages	2010-05-17 21:15:40 +02:00
sun3	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
sun3x	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
tools/amiga	Convert files to UTF-8 and some cleanups	2007-10-19 23:21:04 +02:00
install.sh	kbuild: use INSTALLKERNEL to select customized installkernel script	2009-09-20 12:18:14 +02:00
Kconfig	time: Kill off CONFIG_GENERIC_TIME	2010-07-27 12:40:54 +02:00
Kconfig.debug	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
Makefile	kbuild: allow assignment to {A,C,LD}FLAGS_MODULE on the command line	2010-08-03 14:09:45 +02:00