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
..
acpi	ACPI: skip checking BM_STS if the BIOS doesn't ask for it	2010-07-22 16:54:27 -04:00
asm-generic	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
crypto
drm	Merge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6	2010-08-05 16:02:01 -07:00
keys
linux	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
math-emu	math-emu: correct test for downshifting fraction in _FP_FROM_INT()	2010-07-20 18:45:14 -07:00
media	V4L/DVB: dib0700: break keytable into NEC and RC-5 variants	2010-08-02 16:43:49 -03:00
mtd
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2010-08-04 11:47:58 -07:00
pcmcia	pcmcia: use struct resource for PCMCIA devices, part 2	2010-08-03 09:04:16 +02:00
rdma
rxrpc	net: use __packed annotation	2010-06-03 03:21:52 -07:00
scsi	[SCSI] implement runtime Power Management	2010-07-28 09:07:50 -05:00
sound	pm_qos: Get rid of the allocation in pm_qos_add_request()	2010-07-19 02:00:34 +02:00
trace	[CPUFREQ] x86 cpufreq: Make trace_power_frequency cpufreq driver independent	2010-08-03 13:47:05 -04:00
video
xen	x86: Call HVMOP_pagetable_dying on exit_mmap.	2010-07-26 23:13:26 -07:00
Kbuild