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	V4L/DVB: mediabus: fix ambiguous pixel code names	2010-08-02 16:43:36 -03:00
boot	Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6	2010-06-04 15:42:09 -07:00
cchips
configs	sh: fix up sh7785lcr_32bit_defconfig.	2010-05-24 08:33:53 +09:00
drivers	sh: Fix up IORESOURCE_PCI_FIXED usage in pcibios_fixup_device_resources().	2010-06-07 11:42:01 +09:00
include	Merge branch 'linus' into perf/core	2010-07-21 21:43:06 +02:00
kernel	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
lib	arch/sh/lib/strlen.S: Checkpatch cleanup	2010-05-24 08:11:07 +09:00
lib64
math-emu	Revert "endian: #define __BYTE_ORDER"	2010-05-26 08:30:15 -07:00
mm	lmb: rename to memblock	2010-07-14 17:14:00 +10:00
oprofile
tools
Kconfig	time: Kill off CONFIG_GENERIC_TIME	2010-07-27 12:40:54 +02:00
Kconfig.cpu
Kconfig.debug
Makefile	sh: mach-sdk7786: update defconfig for compressed kernel image.	2010-04-26 17:45:34 +09:00