Merge branch 'linus' into timers/core

Conflicts:
	Documentation/feature-removal-schedule.txt

Merge reason: Resolve the conflict, update to upstream.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --cc Documentation/feature-removal-schedule.txt
index 198acdc05fd1d22248c6ad1c16a1185821192195,ed511af0f79a5697d560a00d37ee26f601198673..8f8e4241bd90675aa692dc7fca294b37a4cbbaf5
--- 1/Documentation/feature-removal-schedule.txt
--- 2/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@@ -564,6 -564,6 +564,16 @@@ Who:      Avi Kivity <avi@redhat.com
  
  ----------------------------
  
++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 kernel-allocated memory slots
  When: July 2010
  Why:  Since 2.6.25, kvm supports user-allocated memory slots, which are