Merge branch 'timers-timekeeping-for-linus' of git://git.kernel.org/pub/scm/linux...

* '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")

diff --cc Documentation/feature-removal-schedule.txt
index 6fdb837,cd648db..71f0fea
--- 1/Documentation/feature-removal-schedule.txt
--- 2/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@@ -445,16 -538,27 +445,6 @@@ Who:     Jan Kiszka <jan.kiszka@web.de
  
  ----------------------------
  
- What: xtime, wall_to_monotonic
- When: 2.6.36+
- Files:        kernel/time/timekeeping.c include/linux/time.h
- Why:  Cleaning up timekeeping internal values. Please use
-       existing timekeeping accessor functions to access
-       the equivalent functionality.
- Who:  John Stultz <johnstul@us.ibm.com>
 -What: KVM memory aliases support
 -When: July 2010
 -Why:  Memory aliasing support is used for speeding up guest vga access
 -      through the vga windows.
 -
 -      Modern userspace no longer uses this feature, so it's just bitrotted
 -      code and can be removed with no impact.
 -Who:  Avi Kivity <avi@redhat.com>
 -
 -----------------------------
 -
 -What: KVM kernel-allocated memory slots
 -When: July 2010
 -Why:  Since 2.6.25, kvm supports user-allocated memory slots, which are
 -      much more flexible than kernel-allocated slots.  All current userspace
 -      supports the newer interface and this code can be removed with no
 -      impact.
 -Who:  Avi Kivity <avi@redhat.com>
--
------------------------------
--
  What: KVM paravirt mmu host support
  When: January 2011
  Why:  The paravirt mmu host support is slower than non-paravirt mmu, both

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/microblaze/Kconfig
Simple merge

diff --cc arch/mips/Kconfig
Simple merge

diff --cc arch/powerpc/Kconfig
Simple merge

diff --cc arch/s390/kernel/time.c
Simple merge

diff --cc arch/sparc/Kconfig
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc drivers/acpi/processor_idle.c
Simple merge

diff --cc drivers/misc/Kconfig
Simple merge

diff --cc kernel/debug/kdb/kdb_main.c
Simple merge

diff --cc kernel/hrtimer.c
Simple merge

diff --cc kernel/trace/Kconfig
Simple merge