Merge branch 'timers-timekeeping-for-linus' of git://git.kernel.org/pub/scm/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 Aug 2010 20:18:29 +0000 (13:18 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 Aug 2010 20:18:29 +0000 (13:18 -0700)
commitb62ad9ab181a67207a4c8c373461b587c4861a68
treeace1572964d81f5f9bbc10b7960c1f742832d744
parentaf390084359a5de20046c901529b2b6a50b941cb
parentb29230769e3482bbd62a07d6d9485371ee66a18f
Merge branch 'timers-timekeeping-for-linus' of git://git./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")
14 files changed:
Documentation/feature-removal-schedule.txt
Documentation/kernel-parameters.txt
arch/arm/Kconfig
arch/microblaze/Kconfig
arch/mips/Kconfig
arch/powerpc/Kconfig
arch/s390/kernel/time.c
arch/sparc/Kconfig
arch/x86/Kconfig
drivers/acpi/processor_idle.c
drivers/misc/Kconfig
kernel/debug/kdb/kdb_main.c
kernel/hrtimer.c
kernel/trace/Kconfig