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

Conflicts:
	Documentation/feature-removal-schedule.txt

diff --cc Documentation/feature-removal-schedule.txt
index 067c92d8a073029d8c7e2f155e17ca3178fea6b5,223fe9fcfd94eceb57c398b70642a4f6ab521ff7..9390c7ddc396dfa437f10602ea6c57bf0abf4585
--- 1/Documentation/feature-removal-schedule.txt
--- 2/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.

diff --cc arch/powerpc/include/asm/reg_booke.h
Simple merge

diff --cc arch/x86/include/asm/kvm_host.h
Simple merge

diff --cc arch/x86/kvm/x86.c
Simple merge