From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 15 Mar 2010 07:17:33 +0000 (+0100)
Subject: Merge branch 'linus' into timers/core
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=12b8aeee3e51654fb95a3baff2e093f2513bb87d;p=openwrt%2Fstaging%2Fblogic.git

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>
---

12b8aeee3e51654fb95a3baff2e093f2513bb87d
diff --cc Documentation/feature-removal-schedule.txt
index 198acdc05fd1,ed511af0f79a..8f8e4241bd90
--- a/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