From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 30 Apr 2012 04:16:01 +0000 (+1000)
Subject: Merge remote-tracking branch 'kvm/linux-next'
X-Git-Tag: next-20120430~24
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=172b680e84524376602d8a5ab73f87791a090e92;p=karo-tx-linux.git

Merge remote-tracking branch 'kvm/linux-next'

Conflicts:
	Documentation/feature-removal-schedule.txt
---

172b680e84524376602d8a5ab73f87791a090e92
diff --cc Documentation/feature-removal-schedule.txt
index 067c92d8a073,223fe9fcfd94..9390c7ddc396
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@@ -542,9 -542,8 +542,16 @@@ Who:	Sasikantha Babu <sasikanth.v19@gma
  
  ----------------------------
  
 +What:	cgroup option updates via remount
 +When:	March 2013
 +Why:	Remount currently allows changing bound subsystems and
 +	release_agent.  Rebinding is hardly useful as it only works
 +	when the hierarchy is empty and release_agent itself should be
 +	replaced with conventional fsnotify.
++
++----------------------------
++
+ What:	KVM debugfs statistics
+ When:	2013
+ Why:	KVM tracepoints provide mostly equivalent information in a much more
+         flexible fashion.
 -