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 47916be4e28c ("Merge branch
'powerpc.cherry-picks' into timers/clocksource")
2010-08-06 13:18:29 -07:00
..
2010-05-18 14:45:53 -07:00
2010-02-08 10:42:17 -08:00
2010-02-08 10:42:17 -08:00
2010-03-03 11:25:59 +01:00
2009-10-29 22:34:15 +09:00
2010-05-18 14:45:54 -07:00
2008-02-04 15:42:06 -08:00
2008-02-04 15:42:06 -08:00
2009-06-17 09:33:49 -07:00
2008-04-08 13:51:35 -07:00
2009-03-27 11:11:04 -07:00
2009-03-27 11:11:04 -07:00
2006-12-07 10:48:19 -08:00
2010-05-18 14:45:53 -07:00
2010-02-08 10:42:17 -08:00
2007-05-08 14:51:59 -07:00
2010-02-08 10:42:17 -08:00
2010-05-27 15:35:13 -07:00
2010-05-18 14:45:53 -07:00
2010-02-08 10:42:17 -08:00
2010-05-18 14:45:54 -07:00
2010-06-21 15:08:44 -07:00