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
..
c2port	sysfs: add struct file* to bin_attr callbacks	2010-05-21 09:37:31 -07:00
cb710	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
eeprom	i2c: Remove all i2c_set_clientdata(client, NULL) in drivers	2010-06-03 11:33:58 +02:00
ibmasm	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
iwmc3200top	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
sgi-gru	sgi-gru: use for_each_set_bit()	2010-03-12 15:52:44 -08:00
sgi-xp	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
ad525x_dpot-i2c.c	ad525x_dpot: add support for one time programmable pots	2010-05-25 08:07:04 -07:00
ad525x_dpot-spi.c	ad525x_dpot: add support for SPI parts	2010-05-25 08:07:04 -07:00
ad525x_dpot.c	ad525x_dpot: add support for one time programmable pots	2010-05-25 08:07:04 -07:00
ad525x_dpot.h	ad525x_dpot: add support for one time programmable pots	2010-05-25 08:07:04 -07:00
arm-charlcd.c	ARM: 6214/2: driver for the character LCD found in ARM refdesigns	2010-07-26 10:48:28 +01:00
atmel_pwm.c	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
atmel_tclib.c	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
atmel-ssc.c	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
cs5535-mfgpt.c	Andres has moved	2010-07-20 16:25:41 -07:00
ds1682.c	sysfs: add struct file* to bin_attr callbacks	2010-05-21 09:37:31 -07:00
enclosure.c	[SCSI] enclosure: fix error path - actually return ERR_PTR() on error	2010-07-27 12:03:48 -05:00
ep93xx_pwm.c	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
hpilo.c	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
hpilo.h	hpilo: add locking comment	2009-12-11 11:24:51 -08:00
ics932s401.c	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
ioc4.c	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
isl29003.c	isl29003: fix resume functionality	2009-05-06 16:36:10 -07: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
kgdbts.c	kgdbts,sh: Add in breakpoint pc offset for superh	2010-04-02 14:58:17 -05:00
lkdtm.c	lktdm: add support for hardlockup, softlockup and hung task crashes	2010-05-27 09:12:54 -07:00
Makefile	ARM: 6214/2: driver for the character LCD found in ARM refdesigns	2010-07-26 10:48:28 +01:00
phantom.c	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
ti_dac7512.c	drivers/misc: add driver for Texas Instruments DAC7512	2009-12-15 08:53:25 -08:00
tifm_7xx1.c	dma-mapping: replace all DMA_32BIT_MASK macro with DMA_BIT_MASK(32)	2009-04-07 08:31:11 -07:00
tifm_core.c	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
tsl2550.c	tsl2550: Move from i2c/chips to misc	2010-03-13 20:56:54 +01:00
vmware_balloon.c	vmware balloon: clamp number of collected non-balloonable pages	2010-06-04 15:21:44 -07:00